diff --git a/flake.nix b/flake.nix
index 91290b4..977e6c4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -118,17 +118,11 @@
         # "aarch64-darwin"
         # aarch64-darwin is currently disabled due to lack of maintenance
       ];
-      flake = rec {
+      flake = {
         nixosConfigurations = {
-          demeter = nixpkgs.lib.nixosSystem {
-            specialArgs = {
-              liminalSystemModules = nixosModules;
-              liminalHomeManagerModules = homeManagerModules;
-              inherit inputs;
-            };
-            modules = [
-              ./reference/hosts/demeter
-            ];
+          demeter = buildLiminalOS {
+            inherit inputs nixpkgs;
+            systemModule = ./reference/hosts/demeter;
           };
           callisto = buildLiminalOS {
             inherit nixpkgs inputs;
@@ -151,33 +145,12 @@
             ./hosts/phobos
           ];
         };
-
-        nixosModules = rec {
-          inherit (inputs)
-            home-manager
-            nixos-wsl
-            stylix
-            nix-flatpak
-            ;
-          default = liminalOS;
-          liminalOS = ./modules/default.nix;
-        };
-
-        homeManagerModules = rec {
-          inherit (inputs)
-            spicetify
-            stylix
-            nix-index-database
-            zen-browser
-            ;
-          default = liminalOS;
-          liminalOS = ./hm/modules/default.nix;
-        };
       };
       perSystem =
         {
           pkgs,
           system,
+          config,
           ...
         }:
         {
@@ -198,6 +171,15 @@
               ];
           };
 
+          nixosModules = {
+            default = config.nixosModules.liminalOS;
+            liminalOS = ./modules/default.nix;
+          };
+
+          homeManagerModules = {
+            default = config.homeManagerModules.liminalOS;
+            liminalOS = ./hm/modules/default.nix;
+          };
         };
     };
 }
diff --git a/hm/default.nix b/hm/default.nix
index ef23ee1..2c3bf2f 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -1,6 +1,5 @@
 {
-  liminalHomeManagerModules,
-  liminalSystemModules,
+  inputs,
   config,
   lib,
   ...
@@ -10,7 +9,7 @@ let
 in
 {
   imports = [
-    liminalSystemModules.home-manager.nixosModules.home-manager
+    inputs.home-manager.nixosModules.home-manager
   ];
 
   options.liminalOS.integrateHomeManager = lib.mkOption {
@@ -25,6 +24,6 @@ in
     useGlobalPkgs = true;
     useUserPackages = true;
     backupFileExtension = "backup";
-    extraSpecialArgs = { inherit liminalHomeManagerModules; };
+    extraSpecialArgs = { inherit inputs; };
   };
 }
diff --git a/hm/modules/common/shellenv/default.nix b/hm/modules/common/shellenv/default.nix
index 258e3c7..a6d1d43 100644
--- a/hm/modules/common/shellenv/default.nix
+++ b/hm/modules/common/shellenv/default.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  liminalHomeManagerModules,
+  inputs,
   pkgs,
   osConfig,
   ...
@@ -11,7 +11,7 @@ let
 in
 {
   imports = [
-    liminalHomeManagerModules.nix-index-database.hmModules.nix-index
+    inputs.nix-index-database.hmModules.nix-index
     ./fastfetch
   ];
 
diff --git a/hm/modules/linux/platform-tweaks/default.nix b/hm/modules/linux/platform-tweaks/default.nix
index 93f4723..4a389e4 100644
--- a/hm/modules/linux/platform-tweaks/default.nix
+++ b/hm/modules/linux/platform-tweaks/default.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
   lib,
   config,
   osConfig,
@@ -24,6 +25,8 @@ in
   };
 
   config = {
+    services.tlp.enable = lib.mkIf (cfg.formFactor == "laptop") true;
+    programs.light.enable = lib.mkIf (cfg.formFactor == "laptop") true;
     assertions = [
       {
         assertion = cfg.formFactor != null;
diff --git a/hm/modules/linux/programs/default.nix b/hm/modules/linux/programs/default.nix
index 94ccbd3..961a43f 100644
--- a/hm/modules/linux/programs/default.nix
+++ b/hm/modules/linux/programs/default.nix
@@ -1,6 +1,6 @@
 {
   pkgs,
-  liminalHomeManagerModules,
+  inputs,
   config,
   lib,
   ...
@@ -85,11 +85,11 @@ in
     };
 
     home.packages = lib.mkIf cfg.zen.enable [
-      liminalHomeManagerModules.zen-browser.packages.${pkgs.system}.default
+      inputs.zen-browser.packages.${pkgs.system}.default
     ];
 
     home.sessionVariables.DEFAULT_BROWSER = lib.mkIf cfg.zen.enable "${
-      liminalHomeManagerModules.zen-browser.packages.${pkgs.system}.default
+      inputs.zen-browser.packages.${pkgs.system}.default
     }/bin/zen";
   };
 }
diff --git a/hm/modules/linux/spicetify/default.nix b/hm/modules/linux/spicetify/default.nix
index 693e4f4..985397e 100644
--- a/hm/modules/linux/spicetify/default.nix
+++ b/hm/modules/linux/spicetify/default.nix
@@ -1,5 +1,5 @@
 {
-  liminalHomeManagerModules,
+  inputs,
   pkgs,
   config,
   osConfig,
@@ -7,11 +7,11 @@
   ...
 }:
 let
-  spicepkgs = liminalHomeManagerModules.spicetify.legacyPackages.${pkgs.system};
+  spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
 in
 {
   imports = [
-    liminalHomeManagerModules.spicetify.homeManagerModules.default
+    inputs.spicetify.homeManagerModules.default
   ];
 
   config = lib.mkIf (config.liminalOS.programs.enable && osConfig.liminalOS.config.allowUnfree) {
diff --git a/modules/linux/flatpak/default.nix b/modules/linux/flatpak/default.nix
index f84a150..6c65c41 100644
--- a/modules/linux/flatpak/default.nix
+++ b/modules/linux/flatpak/default.nix
@@ -3,7 +3,7 @@
 # persist between generations. This is not ideal, but at least it is a better
 # situation than imperative installation
 {
-  liminalSystemModules,
+  inputs,
   config,
   lib,
   ...
@@ -13,7 +13,7 @@ let
 in
 {
   imports = [
-    liminalSystemModules.nix-flatpak.nixosModules.nix-flatpak
+    inputs.nix-flatpak.nixosModules.nix-flatpak
   ];
 
   options.liminalOS.programs.flatpak = {
diff --git a/modules/linux/misc/default.nix b/modules/linux/misc/default.nix
index b9af25f..b23d6ce 100644
--- a/modules/linux/misc/default.nix
+++ b/modules/linux/misc/default.nix
@@ -103,9 +103,6 @@ in
       )
     );
 
-    services.tlp.enable = lib.mkIf (cfg.formFactor == "laptop") true;
-    programs.light.enable = lib.mkIf (cfg.formFactor == "laptop") true;
-
     environment.variables.EDITOR = lib.mkIf (
       cfg.defaultEditor != null
     ) cfg.defaultEditor.meta.mainProgram;
diff --git a/modules/linux/stylix/default.nix b/modules/linux/stylix/default.nix
index 532e745..52bf4db 100644
--- a/modules/linux/stylix/default.nix
+++ b/modules/linux/stylix/default.nix
@@ -1,5 +1,5 @@
 {
-  liminalSystemModules,
+  inputs,
   pkgs,
   config,
   lib,
@@ -24,45 +24,20 @@ in
         Whether to enable plymouth and sane defaults.
       '';
     };
-    wallpaper = lib.mkOption {
-      type = lib.types.path;
-      default = "../../../hm/modules/common/shellenv/fastfetch/nixos-logo.png";
-      description = ''
-        Path to wallpaper to set as background and generate system colorscehme from.
-      '';
-    };
-    polarity = lib.mkOption {
-      type = lib.types.nullOr (
-        lib.types.enum [
-          "light"
-          "dark"
-        ]
-      );
-      default = null;
-      description = ''
-        Whether to force colorscheme to be generated as light or dark theme. Set to null to automatically determine.
-      '';
-    };
-    base16Scheme = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      description = ''
-        Base 16 colorscheme from base16-schemes to override wallpaper generated colorscheme with. Set to null to use wallpaper generated scheme.
-        Example: ''${pkgs.base16-schemes}/share/themes/rose-pine.yaml
-      '';
-    };
   };
 
   imports = [
-    liminalSystemModules.stylix.nixosModules.stylix
+    inputs.stylix.nixosModules.stylix
   ];
 
   config = lib.mkIf cfg.enable {
     stylix = {
       enable = true;
-      image = lib.mkIf (cfg.wallpaper != null) cfg.wallpaper;
-      base16Scheme = lib.mkIf (cfg.base16Scheme != null) cfg.base16Scheme;
-      polarity = lib.mkIf (cfg.polarity != null) cfg.polarity;
+      image = "${inputs.wallpapers}/aesthetic/afterglow_city_skyline_at_night.png";
+      # image = "${inputs.wallpapers}/aesthetic/red_deadly_sun.jpg";
+      # image = "${inputs.wallpapers}/aesthetic/afterglow_sand_dunes.jpg";
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
+      polarity = "dark";
 
       fonts = {
         serif = {
diff --git a/modules/linux/wsl/default.nix b/modules/linux/wsl/default.nix
index b0e9d19..d2f4416 100644
--- a/modules/linux/wsl/default.nix
+++ b/modules/linux/wsl/default.nix
@@ -1,5 +1,5 @@
 {
-  liminalSystemModules,
+  inputs,
   config,
   lib,
   ...
@@ -9,7 +9,7 @@ let
 in
 {
   imports = [
-    liminalSystemModules.nixos-wsl.nixosModules.default
+    inputs.nixos-wsl.nixosModules.default
   ];
 
   options.liminalOS.wsl = {
diff --git a/reference/hosts/demeter/configuration.nix b/reference/hosts/demeter/configuration.nix
index 8080587..aa63bad 100755
--- a/reference/hosts/demeter/configuration.nix
+++ b/reference/hosts/demeter/configuration.nix
@@ -19,10 +19,6 @@
     config.allowUnfree = true;
     defaultEditor = inputs.viminal.packages.${pkgs.system}.default;
     formFactor = "desktop";
-    theming = {
-      wallpaper = "${inputs.wallpapers}/aesthetic/afterglow_city_skyline_at_night.png";
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
-    };
     system = {
       audio.prod.enable = true;
       networking = {