diff --git a/src/objects/zcl_abapgit_object_enho.clas.abap b/src/objects/zcl_abapgit_object_enho.clas.abap
index c604d5456..15d1fdf8e 100644
--- a/src/objects/zcl_abapgit_object_enho.clas.abap
+++ b/src/objects/zcl_abapgit_object_enho.clas.abap
@@ -213,7 +213,14 @@ CLASS zcl_abapgit_object_enho IMPLEMENTATION.
 
   METHOD zif_abapgit_object~is_locked.
 
-    rv_is_locked = abap_false.
+    DATA: lv_object TYPE seqg3-garg.
+
+    lv_object = |{ ms_item-obj_type }{ ms_item-obj_name }|.
+    OVERLAY lv_object WITH '                                          '.
+    lv_object = lv_object && '*'.
+
+    rv_is_locked = exists_a_lock_entry_for( iv_lock_object = 'E_ENHANCE'
+                                            iv_argument    = lv_object ).
 
   ENDMETHOD.
 
diff --git a/src/objects/zcl_abapgit_object_form.clas.abap b/src/objects/zcl_abapgit_object_form.clas.abap
index 4be92bf02..960c2e9b6 100644
--- a/src/objects/zcl_abapgit_object_form.clas.abap
+++ b/src/objects/zcl_abapgit_object_form.clas.abap
@@ -436,7 +436,17 @@ CLASS zcl_abapgit_object_form IMPLEMENTATION.
 
   METHOD zif_abapgit_object~is_locked.
 
-    rv_is_locked = abap_false.
+    DATA: lv_object TYPE seqg3-garg.
+
+    " example lock entry
+    "'001FORM      ZTEST_SAPSCRIPT                                                       TXT'
+    lv_object = |{ sy-mandt }{ ms_item-obj_type }      { ms_item-obj_name }|.
+    OVERLAY lv_object WITH '                                                                                   '.
+    lv_object = lv_object && '*'.
+
+    rv_is_locked = exists_a_lock_entry_for( iv_lock_object = 'ESSFORM'
+                                            iv_argument    = lv_object ).
+
 
   ENDMETHOD.
 
diff --git a/src/objects/zcl_abapgit_object_sfpf.clas.abap b/src/objects/zcl_abapgit_object_sfpf.clas.abap
index a48ad8d01..e43ed8330 100644
--- a/src/objects/zcl_abapgit_object_sfpf.clas.abap
+++ b/src/objects/zcl_abapgit_object_sfpf.clas.abap
@@ -12,16 +12,16 @@ CLASS zcl_abapgit_object_sfpf DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
     METHODS:
       load
         RETURNING VALUE(ri_wb_form) TYPE REF TO if_fp_wb_form
-        RAISING zcx_abapgit_exception,
+        RAISING   zcx_abapgit_exception,
       form_to_xstring
         RETURNING VALUE(rv_xstr) TYPE xstring
-        RAISING zcx_abapgit_exception.
+        RAISING   zcx_abapgit_exception.
 
 ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_OBJECT_SFPF IMPLEMENTATION.
+CLASS zcl_abapgit_object_sfpf IMPLEMENTATION.
 
 
   METHOD fix_oref.
@@ -134,7 +134,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SFPF IMPLEMENTATION.
 
   METHOD zif_abapgit_object~delete.
 
-    DATA: lv_name TYPE fpname,
+    DATA: lv_name    TYPE fpname,
           lo_wb_form TYPE REF TO cl_fp_wb_form.
 
 
@@ -227,7 +227,15 @@ CLASS ZCL_ABAPGIT_OBJECT_SFPF IMPLEMENTATION.
 
   METHOD zif_abapgit_object~is_locked.
 
-    rv_is_locked = abap_false.
+    DATA: lv_object TYPE seqg3-garg.
+
+    lv_object = |{ ms_item-obj_name }|.
+    OVERLAY lv_object WITH '                              '.
+    lv_object = lv_object && '*'.
+
+    rv_is_locked = exists_a_lock_entry_for( iv_lock_object = 'EFPFORM'
+                                            iv_argument    = lv_object ).
+
 
   ENDMETHOD.
 
diff --git a/src/objects/zcl_abapgit_object_sfpi.clas.abap b/src/objects/zcl_abapgit_object_sfpi.clas.abap
index 16219d2d8..e9f56b47f 100644
--- a/src/objects/zcl_abapgit_object_sfpi.clas.abap
+++ b/src/objects/zcl_abapgit_object_sfpi.clas.abap
@@ -8,10 +8,10 @@ CLASS zcl_abapgit_object_sfpi DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
     METHODS:
       load
         RETURNING VALUE(ri_wb_interface) TYPE REF TO if_fp_wb_interface
-        RAISING zcx_abapgit_exception,
+        RAISING   zcx_abapgit_exception,
       interface_to_xstring
         RETURNING VALUE(rv_xstr) TYPE xstring
-        RAISING zcx_abapgit_exception.
+        RAISING   zcx_abapgit_exception.
 
 ENDCLASS.
 
@@ -67,7 +67,7 @@ CLASS zcl_abapgit_object_sfpi IMPLEMENTATION.
 
   METHOD zif_abapgit_object~delete.
 
-    DATA: lv_name TYPE fpname,
+    DATA: lv_name         TYPE fpname,
           lo_wb_interface TYPE REF TO cl_fp_wb_interface.
 
 
@@ -159,7 +159,14 @@ CLASS zcl_abapgit_object_sfpi IMPLEMENTATION.
 
   METHOD zif_abapgit_object~is_locked.
 
-    rv_is_locked = abap_false.
+    DATA: lv_object TYPE seqg3-garg.
+
+    lv_object = |{ ms_item-obj_name }|.
+    OVERLAY lv_object WITH '                              '.
+    lv_object = lv_object && '*'.
+
+    rv_is_locked = exists_a_lock_entry_for( iv_lock_object = 'EFPINTERFACE'
+                                            iv_argument    = lv_object ).
 
   ENDMETHOD.