diff --git a/lib/neo4j/active_node/query/query_proxy_link.rb b/lib/neo4j/active_node/query/query_proxy_link.rb
index <HASH>..<HASH> 100644
--- a/lib/neo4j/active_node/query/query_proxy_link.rb
+++ b/lib/neo4j/active_node/query/query_proxy_link.rb
@@ -115,7 +115,11 @@ module Neo4j
             end
 
             def converted_key(model, key)
-              (model && key.to_sym == :id) ? model.id_property_name : key
+              if key.to_sym == :id
+                model ? model.id_property_name : :uuid
+              else
+                key
+              end
             end
 
             def converted_value(model, key, value)
Probably a better way to approach it