diff --git a/test/comparison/testdata/fbs/typeful/c/objectbox-model.h.expected b/test/comparison/testdata/fbs/typeful/c/objectbox-model.h.expected
index 48a11fc..9b337ab 100644
--- a/test/comparison/testdata/fbs/typeful/c/objectbox-model.h.expected
+++ b/test/comparison/testdata/fbs/typeful/c/objectbox-model.h.expected
@@ -86,27 +86,27 @@ static inline OBX_model* create_obx_model() {
     obx_model_property_flags(model, (OBXPropertyFlags) (OBXPropertyFlags_INDEXED | OBXPropertyFlags_UNIQUE));
     obx_model_property_index_id(model, 8, 5558237345453186302);
     obx_model_property(model, "flexValue", OBXPropertyType_Flex, 10, 7845762441295307478);
-    obx_model_relation(model, 1, 7845762441295307478, 1, 8717895732742165505);
-    obx_model_relation(model, 2, 771642788862502430, 1, 8717895732742165505);
-    obx_model_entity_last_property_id(model, 9, 6972732843819909978);
+    obx_model_relation(model, 1, 771642788862502430, 1, 8717895732742165505);
+    obx_model_relation(model, 2, 8514850266767180993, 1, 8717895732742165505);
+    obx_model_entity_last_property_id(model, 10, 7845762441295307478);
     
     obx_model_entity(model, "TSDate", 3, 6050128673802995827);
-    obx_model_property(model, "id", OBXPropertyType_Long, 1, 8514850266767180993);
+    obx_model_property(model, "id", OBXPropertyType_Long, 1, 8683452355129068124);
     obx_model_property_flags(model, OBXPropertyFlags_ID);
-    obx_model_property(model, "timestamp", OBXPropertyType_Date, 2, 8683452355129068124);
+    obx_model_property(model, "timestamp", OBXPropertyType_Date, 2, 4345851588384648695);
     obx_model_property_flags(model, OBXPropertyFlags_ID_COMPANION);
-    obx_model_entity_last_property_id(model, 2, 8683452355129068124);
+    obx_model_entity_last_property_id(model, 2, 4345851588384648695);
     
     obx_model_entity(model, "TSDateNano", 4, 501233450539197794);
-    obx_model_property(model, "id", OBXPropertyType_Long, 1, 4345851588384648695);
+    obx_model_property(model, "id", OBXPropertyType_Long, 1, 7699391924090763411);
     obx_model_property_flags(model, OBXPropertyFlags_ID);
-    obx_model_property(model, "timestamp", OBXPropertyType_DateNano, 2, 7699391924090763411);
+    obx_model_property(model, "timestamp", OBXPropertyType_DateNano, 2, 388440063886460141);
     obx_model_property_flags(model, OBXPropertyFlags_ID_COMPANION);
-    obx_model_entity_last_property_id(model, 2, 7699391924090763411);
+    obx_model_entity_last_property_id(model, 2, 388440063886460141);
     
     obx_model_last_entity_id(model, 4, 501233450539197794);
     obx_model_last_index_id(model, 8, 5558237345453186302);
-    obx_model_last_relation_id(model, 2, 771642788862502430);
+    obx_model_last_relation_id(model, 2, 8514850266767180993);
     return model; // NOTE: the returned model will contain error information if an error occurred.
 }
 
diff --git a/test/comparison/testdata/fbs/typeful/cpp/objectbox-model.h.expected b/test/comparison/testdata/fbs/typeful/cpp/objectbox-model.h.expected
index 48a11fc..9b337ab 100644
--- a/test/comparison/testdata/fbs/typeful/cpp/objectbox-model.h.expected
+++ b/test/comparison/testdata/fbs/typeful/cpp/objectbox-model.h.expected
@@ -86,27 +86,27 @@ static inline OBX_model* create_obx_model() {
     obx_model_property_flags(model, (OBXPropertyFlags) (OBXPropertyFlags_INDEXED | OBXPropertyFlags_UNIQUE));
     obx_model_property_index_id(model, 8, 5558237345453186302);
     obx_model_property(model, "flexValue", OBXPropertyType_Flex, 10, 7845762441295307478);
-    obx_model_relation(model, 1, 7845762441295307478, 1, 8717895732742165505);
-    obx_model_relation(model, 2, 771642788862502430, 1, 8717895732742165505);
-    obx_model_entity_last_property_id(model, 9, 6972732843819909978);
+    obx_model_relation(model, 1, 771642788862502430, 1, 8717895732742165505);
+    obx_model_relation(model, 2, 8514850266767180993, 1, 8717895732742165505);
+    obx_model_entity_last_property_id(model, 10, 7845762441295307478);
     
     obx_model_entity(model, "TSDate", 3, 6050128673802995827);
-    obx_model_property(model, "id", OBXPropertyType_Long, 1, 8514850266767180993);
+    obx_model_property(model, "id", OBXPropertyType_Long, 1, 8683452355129068124);
     obx_model_property_flags(model, OBXPropertyFlags_ID);
-    obx_model_property(model, "timestamp", OBXPropertyType_Date, 2, 8683452355129068124);
+    obx_model_property(model, "timestamp", OBXPropertyType_Date, 2, 4345851588384648695);
     obx_model_property_flags(model, OBXPropertyFlags_ID_COMPANION);
-    obx_model_entity_last_property_id(model, 2, 8683452355129068124);
+    obx_model_entity_last_property_id(model, 2, 4345851588384648695);
     
     obx_model_entity(model, "TSDateNano", 4, 501233450539197794);
-    obx_model_property(model, "id", OBXPropertyType_Long, 1, 4345851588384648695);
+    obx_model_property(model, "id", OBXPropertyType_Long, 1, 7699391924090763411);
     obx_model_property_flags(model, OBXPropertyFlags_ID);
-    obx_model_property(model, "timestamp", OBXPropertyType_DateNano, 2, 7699391924090763411);
+    obx_model_property(model, "timestamp", OBXPropertyType_DateNano, 2, 388440063886460141);
     obx_model_property_flags(model, OBXPropertyFlags_ID_COMPANION);
-    obx_model_entity_last_property_id(model, 2, 7699391924090763411);
+    obx_model_entity_last_property_id(model, 2, 388440063886460141);
     
     obx_model_last_entity_id(model, 4, 501233450539197794);
     obx_model_last_index_id(model, 8, 5558237345453186302);
-    obx_model_last_relation_id(model, 2, 771642788862502430);
+    obx_model_last_relation_id(model, 2, 8514850266767180993);
     return model; // NOTE: the returned model will contain error information if an error occurred.
 }
 
diff --git a/test/comparison/testdata/fbs/typeful/objectbox-model.json.expected b/test/comparison/testdata/fbs/typeful/objectbox-model.json.expected
index 7c2e478..4ca503f 100644
--- a/test/comparison/testdata/fbs/typeful/objectbox-model.json.expected
+++ b/test/comparison/testdata/fbs/typeful/objectbox-model.json.expected
@@ -211,12 +211,12 @@
       ],
       "relations": [
         {
-          "id": "1:7845762441295307478",
+          "id": "1:771642788862502430",
           "name": "typefuls",
           "targetId": "1:8717895732742165505"
         },
         {
-          "id": "2:771642788862502430",
+          "id": "2:8514850266767180993",
           "name": "m2m",
           "targetId": "1:8717895732742165505"
         }
@@ -224,17 +224,17 @@
     },
     {
       "id": "3:6050128673802995827",
-      "lastPropertyId": "2:8683452355129068124",
+      "lastPropertyId": "2:4345851588384648695",
       "name": "TSDate",
       "properties": [
         {
-          "id": "1:8514850266767180993",
+          "id": "1:8683452355129068124",
           "name": "id",
           "type": 6,
           "flags": 1
         },
         {
-          "id": "2:8683452355129068124",
+          "id": "2:4345851588384648695",
           "name": "timestamp",
           "type": 10,
           "flags": 16384
@@ -243,17 +243,17 @@
     },
     {
       "id": "4:501233450539197794",
-      "lastPropertyId": "2:7699391924090763411",
+      "lastPropertyId": "2:388440063886460141",
       "name": "TSDateNano",
       "properties": [
         {
-          "id": "1:4345851588384648695",
+          "id": "1:7699391924090763411",
           "name": "id",
           "type": 6,
           "flags": 1
         },
         {
-          "id": "2:7699391924090763411",
+          "id": "2:388440063886460141",
           "name": "timestamp",
           "type": 12,
           "flags": 16384
@@ -263,7 +263,7 @@
   ],
   "lastEntityId": "4:501233450539197794",
   "lastIndexId": "8:5558237345453186302",
-  "lastRelationId": "2:771642788862502430",
+  "lastRelationId": "2:8514850266767180993",
   "modelVersion": 5,
   "modelVersionParserMinimum": 5,
   "retiredEntityUids": [],