diff --git a/src/Fame-Core/FMProperty.class.st b/src/Fame-Core/FMProperty.class.st
index c1880e2b..2dd56087 100644
--- a/src/Fame-Core/FMProperty.class.st
+++ b/src/Fame-Core/FMProperty.class.st
@@ -32,6 +32,13 @@ FMProperty >> defaultValue: aValue [
 	defaultValue := aValue
 ]
 
+{ #category : #comparing }
+FMProperty >> hasSameDefinitionAs: otherSlot [
+
+	^ (super hasSameDefinitionAs: otherSlot) and: [
+		  defaultValue = otherSlot defaultValue ]
+]
+
 { #category : #testing }
 FMProperty >> isFameSlot [
 	^ true
diff --git a/src/Fame-Core/Object.extension.st b/src/Fame-Core/Object.extension.st
index dd24dc32..114ca2b3 100644
--- a/src/Fame-Core/Object.extension.st
+++ b/src/Fame-Core/Object.extension.st
@@ -34,14 +34,14 @@ Object >> metaDescriptionIn: aMetamodel [
 ]
 
 { #category : #'*Fame-Core' }
-Object >> metamodel [
-
-	^ self class metamodel
+Object class >> metamodel [ 
+	^ nil
 ]
 
 { #category : #'*Fame-Core' }
-Object class >> metamodel [ 
-	^ nil
+Object >> metamodel [
+
+	^ self class metamodel
 ]
 
 { #category : #'*Fame-Core' }