diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 2c04a26f9..0956f5428 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -70,8 +70,8 @@ defmodule Pleroma.Activity do
     join(query, join_type, [activity], o in Object,
       on:
         fragment(
-          "(?->>'id') = COALESCE(?->'object'->>'id', ?->>'object')",
-          o.data,
+          "? = COALESCE(?->'object'->>'id', ?->>'object')",
+          o.ap_id,
           activity.data,
           activity.data
         ),
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index bea93ecda..f3183db0c 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -67,7 +67,7 @@ defmodule Pleroma.Object do
   def get_by_ap_id(nil), do: nil
 
   def get_by_ap_id(ap_id) do
-    Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id)))
+    Repo.one(from(object in Object, where: object.ap_id == ^ap_id))
   end
 
   defp warn_on_no_object_preloaded(ap_id) do