diff --git a/flask_peewee/rest/__init__.py b/flask_peewee/rest/__init__.py
index d59140f..fdbbbff 100644
--- a/flask_peewee/rest/__init__.py
+++ b/flask_peewee/rest/__init__.py
@@ -497,6 +497,9 @@ def save_object(self, instance, raw_data):
         instance.save()
         return instance
 
+    def get_object_or_404(self, pk):
+        return get_object_or_404(self.get_query(), self.pk == pk)
+
     def api_list(self):
         if not self.check_http_method():
             return self.response_forbidden()
@@ -507,7 +510,7 @@ def api_list(self):
             return self.create()
 
     def api_detail(self, pk):
-        obj = get_object_or_404(self.get_query(), self.pk == pk)
+        obj = self.get_object_or_404(pk)
 
         if not self.check_http_method(obj):
             return self.response_forbidden()
@@ -574,7 +577,7 @@ def api_detail_json(self, pk, field, path):
         if field not in self.editable_json_fields:
             return Response({'error': 'Not Found'}, 404)
 
-        obj = get_object_or_404(self.get_query(), self.pk == pk)
+        obj = self.get_object_or_404(pk)
         if not self.check_http_method(obj):
             return self.response_forbidden()