diff --git a/Makefile b/Makefile
index 8782b19..6bc2cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,3 +26,6 @@ cleanRoot:
 
 news:
 	home-manager news --flake ./.
+
+music:
+	doas nixos-rebuild switch --flake ./#music
diff --git a/nixos/configs/default.nix b/nixos/configs/default.nix
index d80ce1a..867697e 100644
--- a/nixos/configs/default.nix
+++ b/nixos/configs/default.nix
@@ -1,6 +1,8 @@
 toplevel@{ inputs, withSystem, ... }:
 let
   system = "x86_64-linux";
+  nixosModules = toplevel.config.flake.nixosModules;
+  minimal = [ ./nova-hardware.nix inputs.hosts.nixosModule ] ++ (with nixosModules; [ grub base sound wayland security ivand wireless wireguard ]);
 in
 {
   flake.nixosConfigurations = {
@@ -10,11 +12,15 @@ in
           inherit inputs inputs';
           packages = config.packages;
         };
-        modules = [
-          ./nova-hardware.nix
-          inputs.hosts.nixosModule
-          inputs.musnix.nixosModules.musnix
-        ] ++ (with toplevel.config.flake.nixosModules; [ grub base sound music wayland security ivand wireless wireguard ]);
+        modules = minimal;
+      });
+    music = withSystem system (ctx@{ config, inputs', ... }:
+      inputs.nixpkgs.lib.nixosSystem {
+        specialArgs = {
+          inherit inputs inputs';
+          packages = config.packages;
+        };
+        modules = minimal ++ [ inputs.musnix.nixosModules.musnix ] ++ (with nixosModules; [ music ]);
       });
     vm = withSystem system (ctx@{ config, inputs', ... }:
       inputs.nixpkgs.lib.nixosSystem {
@@ -24,7 +30,7 @@ in
         };
         modules = [
           inputs.hosts.nixosModule
-        ] ++ (with toplevel.config.flake.nixosModules; [ vm base security testUser ]);
+        ] ++ (with nixosModules; [ vm base security testUser ]);
       });
   };
 }