diff --git a/lib/nulla/activitypub.ex b/lib/nulla/activitypub.ex
index 0f7dd73..40410dd 100644
--- a/lib/nulla/activitypub.ex
+++ b/lib/nulla/activitypub.ex
@@ -122,10 +122,10 @@ defmodule Nulla.ActivityPub do
   def following(actor, total) do
     Jason.OrderedObject.new(
       "@context": "https://www.w3.org/ns/activitystreams",
-      id: "https://#{actor.domain}/users/#{actor.preferredUsername}/following",
+      id: "#{actor.ap_id}/following",
       type: "OrderedCollection",
       totalItems: total,
-      first: "https://#{actor.domain}/users/#{actor.preferredUsername}/following?page=1"
+      first: "#{actor.ap_id}/following?page=1"
     )
   end
 
@@ -134,12 +134,12 @@ defmodule Nulla.ActivityPub do
   def following(actor, total, following_list, page, limit) when is_integer(page) and page > 0 do
     data = [
       "@context": "https://www.w3.org/ns/activitystreams",
-      id: "https://#{actor.domain}/@#{actor.preferredUsername}/following?page=#{page}",
+      id: "#{actor.ap_id}/following?page=#{page}",
       type: "OrderedCollectionPage",
       totalItems: total,
-      next: "https://#{actor.domain}/users/#{actor.preferredUsername}/following?page=#{page + 1}",
-      prev: "https://#{actor.domain}/users/#{actor.preferredUsername}/following?page=#{page - 1}",
-      partOf: "https://#{actor.domain}/users/#{actor.preferredUsername}/following",
+      next: "#{actor.ap_id}/following?page=#{page + 1}",
+      prev: "#{actor.ap_id}/following?page=#{page - 1}",
+      partOf: "#{actor.ap_id}/following",
       orderedItems: following_list
     ]
 
@@ -166,10 +166,10 @@ defmodule Nulla.ActivityPub do
   def followers(actor, total) do
     Jason.OrderedObject.new(
       "@context": "https://www.w3.org/ns/activitystreams",
-      id: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers",
+      id: "#{actor.ap_id}/followers",
       type: "OrderedCollection",
       totalItems: total,
-      first: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers?page=1"
+      first: "#{actor.ap_id}/followers?page=1"
     )
   end
 
@@ -179,12 +179,12 @@ defmodule Nulla.ActivityPub do
       when is_integer(page) and page > 0 do
     data = [
       "@context": "https://www.w3.org/ns/activitystreams",
-      id: "https://#{actor.domain}/users#{actor.preferredUsername}/followers?page=#{page}",
+      id: "#{actor.ap_id}/followers?page=#{page}",
       type: "OrderedCollectionPage",
       totalItems: total,
-      next: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers?page=#{page + 1}",
-      prev: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers?page=#{page - 1}",
-      partOf: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers",
+      next: "#{actor.ap_id}/followers?page=#{page + 1}",
+      prev: "#{actor.ap_id}/followers?page=#{page - 1}",
+      partOf: "#{actor.ap_id}/followers",
       orderedItems: followers_list
     ]