diff --git a/modules_dentritic/features/desktop/rice/music.nix b/modules_dentritic/features/desktop/rice/music.nix
index 14a7cba..bbf2014 100644
--- a/modules_dentritic/features/desktop/rice/music.nix
+++ b/modules_dentritic/features/desktop/rice/music.nix
@@ -1,28 +1,25 @@
 { self, inputs, ... }:
 {
-  flake = {
-    homeModules = {
-      spicetify = {pkgs, lib, ...}:
-      let
-        spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-      in {
-        programs.spicetify = {
-          enable = true;
+  flake.nixosModules.spicetify = {pkgs, lib, ...}:
+  let
+    spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
+  in
+  {
+    programs.spicetify = {
+      enable = true;
 
-          enabledCustomApps = with spicePkgs.apps; [
-            newReleases
-            ncsVisualizer
-          ];
+      enabledCustomApps = with spicePkgs.apps; [
+        newReleases
+        ncsVisualizer
+      ];
 
-          enabledSnippets = with spicePkgs.snippets; [
-            rotatingCoverart
-            pointer
-          ];
+      enabledSnippets = with spicePkgs.snippets; [
+        rotatingCoverart
+        pointer
+      ];
 
-          theme = lib.mkDefault spicePkgs.themes.catppuccin;
-          colorScheme = lib.mkDefault "mocha";
-        };
-      };
+      theme = lib.mkDefault spicePkgs.themes.catppuccin;
+      colorScheme = lib.mkDefault "mocha";
     };
   };
 }
diff --git a/modules_dentritic/hosts/common/common.nix b/modules_dentritic/hosts/common/common.nix
index 7cfb58a..46a33ee 100644
--- a/modules_dentritic/hosts/common/common.nix
+++ b/modules_dentritic/hosts/common/common.nix
@@ -7,7 +7,6 @@
       self.homeModules.zed
       self.homeModules.env
       self.homeModules.git
-      self.homeModules.spicetify
     ];
 
     home = {
@@ -29,6 +28,7 @@
       self.nixosModules.shell
       self.nixosModules.greeter
       self.nixosModules.steam
+      self.nixosModules.spicetify
     ];
   };
 }
diff --git a/modules_dentritic/hosts/framework16/configuration.nix b/modules_dentritic/hosts/framework16/configuration.nix
index d7ff821..fb8a562 100644
--- a/modules_dentritic/hosts/framework16/configuration.nix
+++ b/modules_dentritic/hosts/framework16/configuration.nix
@@ -5,6 +5,7 @@
       self.nixosModules.FW16Config
       inputs.lanzaboote.nixosModules.lanzaboote
       inputs.home-manager.nixosModules.default
+      inputs.spicetify-nix.nixosModules.spicetify
     ];
   };
 
diff --git a/modules_dentritic/parts.nix b/modules_dentritic/parts.nix
index a74884d..653ae68 100644
--- a/modules_dentritic/parts.nix
+++ b/modules_dentritic/parts.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }: 
+{ inputs, ... }:
 {
   imports = [
     inputs.home-manager.flakeModules.home-manager