diff --git a/nixos/configs/default.nix b/nixos/configs/default.nix
index eaffff2..0c4c6a4 100644
--- a/nixos/configs/default.nix
+++ b/nixos/configs/default.nix
@@ -24,7 +24,7 @@ let
       hardware.cpu.intel.updateMicrocode = lib.mkForce false;
     };
   };
-  essential = [ hardwareConfigurations.nova inputs.hosts.nixosModule inputs.home-manager.nixosModules.default ] ++ (with mods; [ grub base sound wayland security ivand wireless wireguard ]);
+  essential = [ hardwareConfigurations.nova ] ++ (with mods; [ grub base sound wayland security ivand wireless wireguard ]);
   systemWithModules = modules: withSystem system (ctx@{ config, inputs', pkgs, ... }: inputs.nixpkgs.lib.nixosSystem {
     specialArgs = {
       inherit inputs inputs' pkgs;
@@ -36,7 +36,7 @@ in
 {
   flake.nixosConfigurations = {
     nixos = systemWithModules essential;
-    music = systemWithModules (essential ++ [ inputs.musnix.nixosModules.musnix mods.music ]);
+    music = systemWithModules (essential ++ [ mods.music ]);
     nonya = systemWithModules (essential ++ (with mods; [ anon cryptocurrency ]));
     ai = systemWithModules (essential ++ (with mods; [ ai ]));
   };
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index c07841f..09d149f 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -1,4 +1,4 @@
-top@{ moduleWithSystem, ... }: {
+top@{ inputs, moduleWithSystem, ... }: {
   flake.nixosModules = {
     grub = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
       boot = {
@@ -13,6 +13,7 @@ top@{ moduleWithSystem, ... }: {
       };
     });
     base = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
+      imports = [ inputs.hosts.nixosModule ];
       system.stateVersion = top.config.flake.stateVersion;
       nix = { extraOptions = ''experimental-features = nix-command flakes''; };
       i18n.supportedLocales = [ "all" ];
@@ -35,6 +36,7 @@ top@{ moduleWithSystem, ... }: {
       environment.systemPackages = with pkgs; [ pwvucontrol ];
     });
     music = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
+      imports = [ inputs.musnix.nixosModules.musnix ];
       environment.systemPackages = with pkgs; [ guitarix ];
       services.pipewire = {
         jack.enable = true;
@@ -128,6 +130,7 @@ top@{ moduleWithSystem, ... }: {
     };
     ivand = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }:
       let homeMods = top.config.flake.homeManagerModules; in {
+        imports = [ inputs.home-manager.nixosModules.default ];
         home-manager = {
           backupFileExtension = "bak";
           useUserPackages = true;