diff --git a/app/Controllers/Admin/PodcastImportController.php b/app/Controllers/Admin/PodcastImportController.php
index 410f040e49fe07cc444b0af19ceabee22b1c5809..2832cf83b4b2c3a5b5178b7b19f544c7ee8ce22f 100644
--- a/app/Controllers/Admin/PodcastImportController.php
+++ b/app/Controllers/Admin/PodcastImportController.php
@@ -345,9 +345,9 @@ class PodcastImportController extends BaseController
 
             $newEpisode = new Episode([
                 'podcast_id' => $newPodcastId,
-                'guid' => $item->guid ?? null,
                 'title' => $item->title,
                 'slug' => $slug,
+                'guid' => $item->guid ?? null,
                 'audio_file' => download_file((string) $item->enclosure->attributes()['url']),
                 'description_markdown' => $converter->convert($itemDescriptionHtml),
                 'description_html' => $itemDescriptionHtml,
diff --git a/app/Entities/Episode.php b/app/Entities/Episode.php
index 264afdaa98da523799a13e074d3446a80c6e0a6b..f5b54d6ce0a4dc4e4ae0a649ae7acce63af30d77 100644
--- a/app/Entities/Episode.php
+++ b/app/Entities/Episode.php
@@ -420,7 +420,7 @@ class Episode extends Entity
 
     public function getLink(): string
     {
-        return base_url(route_to('episode', $this->getPodcast() ->name, $this->attributes['slug']));
+        return url_to('episode', $this->getPodcast()->name, $this->attributes['slug']);
     }
 
     public function getEmbeddablePlayerUrl(string $theme = null): string
diff --git a/app/Libraries/ActivityPub/Models/FavouriteModel.php b/app/Libraries/ActivityPub/Models/FavouriteModel.php
index 32cc81b65709ab9cc6476a24a4bc3faf6338df77..5ea58981e9d3a8cb16fb84743b6fcb0a817e1315 100644
--- a/app/Libraries/ActivityPub/Models/FavouriteModel.php
+++ b/app/Libraries/ActivityPub/Models/FavouriteModel.php
@@ -125,7 +125,7 @@ class FavouriteModel extends UuidModel
 
             $likeActivity = new LikeActivity();
             $likeActivity
-                ->set('id', base_url(route_to('activity', $actor->username, $activity->id)))
+                ->set('id', url_to('activity', $actor->username, $activity->id))
                 ->set('actor', $actor->uri)
                 ->set('object', $status->uri);
 
diff --git a/app/Libraries/ActivityPub/Models/FollowModel.php b/app/Libraries/ActivityPub/Models/FollowModel.php
index 62e2c654753c0f638dbf1fcccd2a2d99de608986..6622f273668c8be0331f87f0549ac7664fc5bc66 100644
--- a/app/Libraries/ActivityPub/Models/FollowModel.php
+++ b/app/Libraries/ActivityPub/Models/FollowModel.php
@@ -83,7 +83,7 @@ class FollowModel extends Model
                         'queued',
                     );
 
-                $followActivity->set('id', base_url(route_to('activity', $actor->username, $activityId)));
+                $followActivity->set('id', url_to('activity', $actor->username, $activityId));
 
                 model('ActivityModel')
                     ->update($activityId, [
diff --git a/app/Libraries/ActivityPub/Models/StatusModel.php b/app/Libraries/ActivityPub/Models/StatusModel.php
index 941beb030dbbc545314cc1d072c8c96eb9553b11..9f46f9f161aea5ff458f6ae1f7b7d8ca4efb6a40 100644
--- a/app/Libraries/ActivityPub/Models/StatusModel.php
+++ b/app/Libraries/ActivityPub/Models/StatusModel.php
@@ -278,7 +278,7 @@ class StatusModel extends UuidModel
         if ($registerActivity) {
             // set status id and uri to construct NoteObject
             $status->id = $newStatusId;
-            $status->uri = base_url(route_to('status', $status->actor->username, $newStatusId));
+            $status->uri = url_to('status', $status->actor->username, $newStatusId);
 
             $createActivity = new CreateActivity();
             $noteObjectClass = config('ActivityPub')
@@ -298,7 +298,7 @@ class StatusModel extends UuidModel
                     'queued',
                 );
 
-            $createActivity->set('id', base_url(route_to('activity', $status->actor->username, $activityId)));
+            $createActivity->set('id', url_to('activity', $status->actor->username, $activityId));
 
             model('ActivityModel')
                 ->update($activityId, [
@@ -411,7 +411,7 @@ class StatusModel extends UuidModel
                     'queued',
                 );
 
-            $deleteActivity->set('id', base_url(route_to('activity', $status->actor->username, $activityId)));
+            $deleteActivity->set('id', url_to('activity', $status->actor->username, $activityId));
 
             model('ActivityModel')
                 ->update($activityId, [
@@ -492,7 +492,7 @@ class StatusModel extends UuidModel
                     'queued',
                 );
 
-            $announceActivity->set('id', base_url(route_to('activity', $status->actor->username, $activityId)));
+            $announceActivity->set('id', url_to('activity', $status->actor->username, $activityId));
 
             model('ActivityModel')
                 ->update($activityId, [
@@ -535,10 +535,7 @@ class StatusModel extends UuidModel
                 ->first();
 
             $announceActivity = new AnnounceActivity($reblogStatus);
-            $announceActivity->set(
-                'id',
-                base_url(route_to('activity', $reblogStatus->actor->username, $activity->id)),
-            );
+            $announceActivity->set('id', url_to('activity', $reblogStatus->actor->username, $activity->id),);
 
             $undoActivity
                 ->set('actor', $reblogStatus->actor->uri)
@@ -555,7 +552,7 @@ class StatusModel extends UuidModel
                     'queued',
                 );
 
-            $undoActivity->set('id', base_url(route_to('activity', $reblogStatus->actor->username, $activityId)));
+            $undoActivity->set('id', url_to('activity', $reblogStatus->actor->username, $activityId));
 
             model('ActivityModel')
                 ->update($activityId, [
@@ -627,7 +624,7 @@ class StatusModel extends UuidModel
             $actor = model('ActorModel')
                 ->getActorById((int) $data['data']['actor_id']);
 
-            $data['data']['uri'] = base_url(route_to('status', $actor->username, $uuid4->toString()));
+            $data['data']['uri'] = url_to('status', $actor->username, $uuid4->toString());
         }
 
         return $data;