diff --git a/src/objects/zcl_abapgit_object_ssfo.clas.abap b/src/objects/zcl_abapgit_object_ssfo.clas.abap
index 8ff2f61b5..690d7a29a 100644
--- a/src/objects/zcl_abapgit_object_ssfo.clas.abap
+++ b/src/objects/zcl_abapgit_object_ssfo.clas.abap
@@ -192,16 +192,28 @@ CLASS zcl_abapgit_object_ssfo IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD fix_ids.
-* makes sure ID and IDREF values are the same values for each serialization run
-* the standard code has a counter that keeps increasing values
 
-    DATA: lv_name     TYPE string,
-          li_idref    TYPE REF TO if_ixml_node,
-          li_node     TYPE REF TO if_ixml_node,
-          li_attr     TYPE REF TO if_ixml_named_node_map,
-          li_iterator TYPE REF TO if_ixml_node_iterator,
-          lt_idref    TYPE STANDARD TABLE OF string WITH DEFAULT KEY.
+    " makes sure ID and IDREF values are the same values for each serialization run
+    " the standard code has a counter that keeps increasing values.
+    "
+    " It is important that IDs and IDREFs which are the same before the fix
+    " are also the same after the fix.
 
+    TYPES:
+      BEGIN OF ty_id_mapping,
+        old TYPE string,
+        new TYPE string,
+      END OF ty_id_mapping,
+      tty_id_mapping TYPE HASHED TABLE OF ty_id_mapping
+                          WITH UNIQUE KEY old.
+
+    DATA: lv_name       TYPE string,
+          li_idref      TYPE REF TO if_ixml_node,
+          li_node       TYPE REF TO if_ixml_node,
+          li_attr       TYPE REF TO if_ixml_named_node_map,
+          li_iterator   TYPE REF TO if_ixml_node_iterator,
+          lt_id_mapping TYPE tty_id_mapping,
+          ls_id_mapping LIKE LINE OF lt_id_mapping.
 
     li_iterator = ii_xml_doc->create_iterator( ).
     li_node = li_iterator->get_next( ).
@@ -210,8 +222,17 @@ CLASS zcl_abapgit_object_ssfo IMPLEMENTATION.
       IF lv_name = 'NODE' OR lv_name = 'WINDOW'.
         li_idref = li_node->get_attributes( )->get_named_item( 'IDREF' ).
         IF li_idref IS BOUND.
-          APPEND li_idref->get_value( ) TO lt_idref.
-          li_idref->set_value( |{ sy-tabix }| ).
+
+          ls_id_mapping-old = li_idref->get_value( ).
+          READ TABLE lt_id_mapping WITH KEY old = ls_id_mapping-old
+                                   INTO ls_id_mapping.
+          IF sy-subrc <> 0.
+            lv_name = lines( lt_id_mapping ) + 1.
+            ls_id_mapping-new = condense( lv_name ).
+            INSERT ls_id_mapping INTO TABLE lt_id_mapping.
+          ENDIF.
+
+          li_idref->set_value( |{ ls_id_mapping-new }| ).
         ENDIF.
       ENDIF.
       li_node = li_iterator->get_next( ).
@@ -224,14 +245,17 @@ CLASS zcl_abapgit_object_ssfo IMPLEMENTATION.
       IF lv_name = 'NODE' OR lv_name = 'WINDOW'.
         li_idref = li_node->get_attributes( )->get_named_item( 'ID' ).
         IF li_idref IS BOUND.
-          lv_name = li_idref->get_value( ).
-          READ TABLE lt_idref WITH KEY table_line = lv_name TRANSPORTING NO FIELDS.
+
+          ls_id_mapping-old = li_idref->get_value( ).
+          READ TABLE lt_id_mapping WITH KEY old = ls_id_mapping-old
+                                   INTO ls_id_mapping.
           IF sy-subrc = 0.
-            li_idref->set_value( |{ sy-tabix }| ).
+            li_idref->set_value( |{ ls_id_mapping-new }| ).
           ELSE.
             li_attr = li_node->get_attributes( ).
             li_attr->remove_named_item( 'ID' ).
           ENDIF.
+
         ENDIF.
       ENDIF.
       li_node = li_iterator->get_next( ).