diff --git a/hosts/nachtigall/apps/mastodon.nix b/hosts/nachtigall/apps/mastodon.nix
index 0dbdc47..06087d9 100644
--- a/hosts/nachtigall/apps/mastodon.nix
+++ b/hosts/nachtigall/apps/mastodon.nix
@@ -40,10 +40,9 @@
     # Different from WEB_DOMAIN in our case
     localDomain = "pub.solar";
     enableUnixSocket = true;
-    # Processes used by the mastodon-streaming service. Defaults to the number
-    # of CPU cores minus one
-    # This is without affect until this comment is addressed
-    # https://github.com/NixOS/nixpkgs/pull/251950#issuecomment-1732568492
+    # Number of processes used by the mastodon-streaming service
+    # Recommended is the amount of your CPU cores minus one
+    # On our current 8-Core system, let's start with 5 for now
     streamingProcesses = 5;
     # Processes used by the mastodon-web service
     webProcesses = 2;
diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index 8800356..8fd02df 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ flake, ... }:
 
 {
   imports =
@@ -28,5 +28,11 @@
       ./apps/matrix/mautrix-telegram.nix
       ./apps/matrix/synapse.nix
       ./apps/nginx-matrix.nix
+
+      "${flake.inputs.unstable}/nixos/modules/services/web-apps/mastodon.nix"
+    ];
+
+    disabledModules = [
+      "services/web-apps/mastodon.nix"
     ];
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index 86a21e1..3ebaefa 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,7 +8,7 @@
       overlays = ({ ... }: {
         nixpkgs.overlays = [
           (final: prev: {
-            mastodon = inputs.mastodon-fork.legacyPackages.${prev.system}.mastodon;
+            mastodon = inputs.unstable.legacyPackages.${prev.system}.mastodon;
             forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo;
             forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner;