diff --git a/hosts/algiz/default.nix b/hosts/algiz/default.nix
index c309579..8ac0456 100644
--- a/hosts/algiz/default.nix
+++ b/hosts/algiz/default.nix
@@ -2,8 +2,7 @@
   inputs,
   config,
   enabled,
-  enableAttrs,
-  listify,
+  pkgs,
   ...
 }:
 {
@@ -13,8 +12,13 @@
 
   oizys = {
     rune.motd = enabled;
-    languages = "nim|node|python|nushell" |> listify;
-  } // ("docker|backups|nix-ld" |> listify |> enableAttrs);
+  };
+
+  environment.systemPackages = with pkgs; [
+    (writeShellScriptBin "gitea" ''
+      ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
+    '')
+  ];
 
   services.restic.backups.gdrive = {
     # directories created by gitea and soft-serve aren't world readable
diff --git a/hosts/algiz/pkgs.nix b/hosts/algiz/pkgs.nix
deleted file mode 100644
index 3d6d274..0000000
--- a/hosts/algiz/pkgs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    (writeShellScriptBin "gitea" ''
-      ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
-    '')
-  ];
-}
diff --git a/hosts/algiz/settings/languages b/hosts/algiz/settings/languages
new file mode 100644
index 0000000..c0b188c
--- /dev/null
+++ b/hosts/algiz/settings/languages
@@ -0,0 +1,4 @@
+nim
+node
+python
+nushell
diff --git a/hosts/algiz/settings/modules b/hosts/algiz/settings/modules
new file mode 100644
index 0000000..ecadd7d
--- /dev/null
+++ b/hosts/algiz/settings/modules
@@ -0,0 +1,3 @@
+docker
+backups
+nix-ld
diff --git a/hosts/mannaz/default.nix b/hosts/mannaz/default.nix
index dee4421..f5da1fd 100644
--- a/hosts/mannaz/default.nix
+++ b/hosts/mannaz/default.nix
@@ -1,10 +1,7 @@
 { enabled, ... }:
 {
   oizys = {
-    desktop = enabled;
-    nix-ld = enabled;
     rune.motd = enabled;
-    docker = enabled;
   };
 
   # Enable the X11 windowing system.
@@ -12,5 +9,4 @@
     displayManager.startx = enabled;
     windowManager.qtile = enabled;
   };
-
 }
diff --git a/hosts/mannaz/pkgs.nix b/hosts/mannaz/pkgs.nix
deleted file mode 100644
index 19b9c85..0000000
--- a/hosts/mannaz/pkgs.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = (
-    with pkgs;
-    [
-      nvitop
-      sops
-    ]
-  );
-}
diff --git a/hosts/mannaz/settings/modules b/hosts/mannaz/settings/modules
new file mode 100644
index 0000000..08f13a4
--- /dev/null
+++ b/hosts/mannaz/settings/modules
@@ -0,0 +1,3 @@
+desktop
+docker
+nix-ld
diff --git a/hosts/mannaz/settings/pkgs b/hosts/mannaz/settings/pkgs
new file mode 100644
index 0000000..4e1780b
--- /dev/null
+++ b/hosts/mannaz/settings/pkgs
@@ -0,0 +1,2 @@
+nvitop
+sops
diff --git a/hosts/naudiz/default.nix b/hosts/naudiz/default.nix
index 97bcfc7..33e37ea 100644
--- a/hosts/naudiz/default.nix
+++ b/hosts/naudiz/default.nix
@@ -1,15 +1,6 @@
 { inputs, enabled, ... }:
-
 {
   imports = [ inputs.nixos-wsl.nixosModules.default ];
-  oizys = {
-    nix-ld = enabled;
-    languages = [
-
-      "python"
-      "node"
-    ];
-  };
   wsl = enabled // {
     defaultUser = "daylin";
   };
diff --git a/hosts/naudiz/settings/languages b/hosts/naudiz/settings/languages
new file mode 100644
index 0000000..7772b32
--- /dev/null
+++ b/hosts/naudiz/settings/languages
@@ -0,0 +1,2 @@
+python
+node
diff --git a/hosts/naudiz/settings/modules b/hosts/naudiz/settings/modules
new file mode 100644
index 0000000..9a42018
--- /dev/null
+++ b/hosts/naudiz/settings/modules
@@ -0,0 +1 @@
+nix-ld
diff --git a/hosts/naudiz/settings/pkgs b/hosts/naudiz/settings/pkgs
new file mode 100644
index 0000000..e69de29
diff --git a/lib/extended.nix b/lib/extended.nix
index a700edc..34c1f70 100644
--- a/lib/extended.nix
+++ b/lib/extended.nix
@@ -166,7 +166,7 @@ let
     {
       hostName,
       pkgs,
-      flake ? flakeFromSystem "x86_64-linux",
+      flake ? flakeFromSystem pkgs.system
     }:
         hostName
         |> pathFromHostName
@@ -174,7 +174,7 @@ let
         |> tryReadLinesNoComment
         |> map (
           line:
-          if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkgs) else pkgs.${line}
+          if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line}
         );
 
 in