diff --git a/home/crow/Incarceron.nix b/home/crow/Incarceron.nix
index 07a7300..3873fac 100644
--- a/home/crow/Incarceron.nix
+++ b/home/crow/Incarceron.nix
@@ -8,6 +8,7 @@
     common/optional/media
     common/optional/gaming
     common/optional/misc/ai.nix
+    common/optional/deferred-apps.nix
   ];
 
   monitors = [
diff --git a/home/crow/Parzival.nix b/home/crow/Parzival.nix
index 83887a1..a69a207 100644
--- a/home/crow/Parzival.nix
+++ b/home/crow/Parzival.nix
@@ -10,6 +10,7 @@
     common/optional/misc/gromit-mpx.nix
     common/optional/misc/art.nix
     common/optional/misc/ai.nix
+    common/optional/deferred-apps.nix
   ];
 
   monitors = [
diff --git a/home/crow/common/core/default.nix b/home/crow/common/core/default.nix
index 542175b..c7c45e0 100644
--- a/home/crow/common/core/default.nix
+++ b/home/crow/common/core/default.nix
@@ -11,7 +11,6 @@ let
 in
 {
   imports = lib.flatten [
-    inputs.deferred-apps.homeManagerModules.default
     (map lib.custom.relativeToRoot [
       "modules/common/host-spec.nix"
       "modules/home"
@@ -26,30 +25,6 @@ in
     ./terminal.nix
   ];
 
-  programs.deferredApps = {
-    enable = true;
-    packages = builtins.attrValues {
-      inherit (pkgs.unstable)
-        orca-slicer
-        super-slicer
-        meshlab
-        openscad
-        freecad
-        ;
-      inherit (pkgs)
-        appimage-run
-        steam-run
-        bitwarden-cli
-        protonvpn-gui
-        imagemagick
-        httpie
-        mkvtoolnix
-        gimp
-        ;
-    };
-    apps = [ "signal-desktop" ];
-  };
-
   home.packages = builtins.attrValues {
     inherit (pkgs)
       screen
diff --git a/home/crow/common/optional/deferred-apps.nix b/home/crow/common/optional/deferred-apps.nix
new file mode 100644
index 0000000..276bc19
--- /dev/null
+++ b/home/crow/common/optional/deferred-apps.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
+{
+
+  imports = lib.flatten [
+    inputs.deferred-apps.homeManagerModules.default
+  ];
+
+  programs.deferredApps = {
+    enable = true;
+    packages = builtins.attrValues {
+      inherit (pkgs.unstable)
+        orca-slicer
+        super-slicer
+        meshlab
+        openscad
+        freecad
+        ;
+      inherit (pkgs)
+        appimage-run
+        steam-run
+        bitwarden-cli
+        protonvpn-gui
+        imagemagick
+        httpie
+        mkvtoolnix
+        gimp
+        ;
+    };
+    apps = [ "signal-desktop" ];
+  };
+
+}