diff --git a/src/database.rs b/src/database.rs
index 4994db3..cee4e4e 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -234,7 +234,8 @@ pub fn remove_object<C: Connection<Backend = Sqlite>>(
     debug!("Deleting {}!", object_address);
 
     let matches = data
-        .filter(target.eq(object_address.encode()?))
+        .filter(identity.eq(object_address.encode()?))
+        .or_filter(target.eq(object_address.encode()?))
         .or_filter(value.eq(EntryValue::Address(object_address).to_string()?));
 
     Ok(diesel::delete(matches).execute(connection)?)
@@ -567,7 +568,7 @@ pub fn insert_entry<C: Connection<Backend = Sqlite>>(
     debug!("Inserting: {}", entry);
 
     let insert_entry = models::Entry {
-        identity: entry.hash()?.0,
+        identity: entry.address()?.encode()?,
         target: entry.target.encode()?,
         key: entry.key,
         value: entry.value.to_string()?,