diff --git a/src/locks/lockfuncs.py b/src/locks/lockfuncs.py
index d5c7f6ceb8..2c85a38b95 100644
--- a/src/locks/lockfuncs.py
+++ b/src/locks/lockfuncs.py
@@ -117,7 +117,7 @@ def self(accessing_obj, accessed_obj, *args, **kwargs):
     This can be used to lock specifically only to
     the same object that the lock is defined on.
     """
-    return accessing_obj == accessed_obj
+    return accessing_obj.typeclass == accessed_obj.typeclass
 
 
 def perm(accessing_obj, accessed_obj, *args, **kwargs):