diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index f48199cae..40e14005b 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -17,11 +17,12 @@ defmodule Pleroma.Activity do
 
   def all_by_object_ap_id(ap_id) do
     Repo.all(from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{object: %{id: ap_id}}))
+      where: fragment("(?)->'object'->>'id' = ?", activity.data, ^to_string(ap_id)))
   end
 
   def get_create_activity_by_object_ap_id(ap_id) do
     Repo.one(from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{type: "Create", object: %{id: ap_id}}))
+      where: fragment("(?)->'object'->>'id' = ?", activity.data, ^to_string(ap_id))
+             and fragment("(?)->>'type' = 'Create'", activity.data))
   end
 end
diff --git a/priv/repo/migrations/20170620133028_add_object_activity_index.exs b/priv/repo/migrations/20170620133028_add_object_activity_index.exs
new file mode 100644
index 000000000..1abbd7802
--- /dev/null
+++ b/priv/repo/migrations/20170620133028_add_object_activity_index.exs
@@ -0,0 +1,7 @@
+defmodule Pleroma.Repo.Migrations.AddObjectActivityIndex do
+  use Ecto.Migration
+
+  def change do
+    create index(:objects, ["(data->'object'->>'id')", "(data->>'type')"], name: :activities_create_objects_index)
+  end
+end