diff --git a/config/default.nix b/config/default.nix
index 4b66b0d..dc0e048 100755
--- a/config/default.nix
+++ b/config/default.nix
@@ -34,7 +34,7 @@ in let
         ]
       )
       // {
-        user = lib.mkOption {
+        users = lib.mkOption {
           type = lib.types.attrsOf userSubmodule;
         };
       };
@@ -79,7 +79,7 @@ in let
           "writefreely"
         ])
       // {
-        instance = lib.mkOption {
+        instances = lib.mkOption {
           type = lib.types.attrsOf instanceSubmodule;
         };
       };
@@ -102,7 +102,7 @@ in let
       };
     };
   };
-  systemSubmodule = lib.types.submodule {
+  machineSubmodule = lib.types.submodule {
     options =
       builtins.listToAttrs (map (name: {
           inherit name;
@@ -119,7 +119,7 @@ in let
           "tablet"
         ])
       // {
-        device = lib.mkOption {
+        devices = lib.mkOption {
           type = lib.types.attrsOf deviceSubmodule;
         };
       };
@@ -146,11 +146,11 @@ in let
     };
 in {
   options = {
-    service = lib.mkOption {
+    services = lib.mkOption {
       type = serviceSubmodule;
     };
-    system = lib.mkOption {
-      type = systemSubmodule;
+    machines = lib.mkOption {
+      type = machineSubmodule;
     };
     people = lib.mkOption {
       type = peopleSubmodule;
@@ -158,8 +158,8 @@ in {
   };
 
   config = {
-    people = import ./user.nix;
-    service = import ./instance.nix;
-    system = import ./device.nix;
+    people = import ./users.nix;
+    services = import ./instances.nix;
+    machines = import ./devices.nix;
   };
 }
diff --git a/config/device.nix b/config/devices.nix
similarity index 99%
rename from config/device.nix
rename to config/devices.nix
index 5af909a..747cd05 100755
--- a/config/device.nix
+++ b/config/devices.nix
@@ -7,7 +7,7 @@ let
   userIdForUser0 = ["uid=1000"];
   userIdForUser1 = ["uid=1001"];
 in {
-  device = {
+  devices = {
     # Desktop
     desktop = {
       label = "Desktop";
diff --git a/config/instance.nix b/config/instances.nix
similarity index 99%
rename from config/instance.nix
rename to config/instances.nix
index d3526cf..36b83d6 100755
--- a/config/instance.nix
+++ b/config/instances.nix
@@ -14,7 +14,7 @@ let
 
   varLib = "/var/lib";
 in {
-  instance = {
+  instances = {
     web = {
       domains = {
         url0 = domain0;
diff --git a/config/user.nix b/config/users.nix
similarity index 98%
rename from config/user.nix
rename to config/users.nix
index f923b63..9dd2dad 100755
--- a/config/user.nix
+++ b/config/users.nix
@@ -6,7 +6,7 @@ in {
     user0
     user1
     ;
-  user = {
+  users = {
     "${user0}" = {
       name = "Nick";
       aliases = {
diff --git a/home-manager/modules/firefox/config/bookmarks.nix b/home-manager/modules/firefox/config/bookmarks.nix
index 3fcedfb..ee0595b 100755
--- a/home-manager/modules/firefox/config/bookmarks.nix
+++ b/home-manager/modules/firefox/config/bookmarks.nix
@@ -1,14 +1,14 @@
 {flake, ...}: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) aliases;
-  inherit (flake.config.system.device) nas server;
-  inherit (flake.config.service) instance;
+  inherit (flake.config.people.users.${user0}) aliases;
+  inherit (flake.config.machines.devices) nas server;
+  inherit (flake.config.services) instances;
   gitlabTags = ["git" "gitlab"];
   youtubeTags = ["youtube" "you" "tube" "yt"];
   jellyfinTags = ["jelly" "video" "streaming" "movies" "shows" "music"];
-  ollamaTags = [instance.ollama.name "chat" "ai"];
-  owncastTags = [instance.owncast.name "own" "cast" "stream"];
-  syncthingTags = [instance.syncthing.name "sync" "thing" instance.synology.name];
+  ollamaTags = [instances.ollama.name "chat" "ai"];
+  owncastTags = [instances.owncast.name "own" "cast" "stream"];
+  syncthingTags = [instances.syncthing.name "sync" "thing" instances.synology.name];
 in {
   programs.firefox.profiles = {
     ${user0} = {
@@ -224,28 +224,28 @@ in {
           toolbar = false;
           bookmarks = [
             {
-              name = instance.forgejo.label;
-              url = "https://${instance.forgejo.subdomain}.${instance.web.domains.url0}";
-              tags = [instance.forgejo.name "forge" "git"];
-              keyword = instance.forgejo.label;
+              name = instances.forgejo.label;
+              url = "https://${instances.forgejo.subdomain}.${instances.web.domains.url0}";
+              tags = [instances.forgejo.name "forge" "git"];
+              keyword = instances.forgejo.label;
             }
             {
-              name = "${instance.jellyfin.label} (Internet)";
-              url = "https://${instance.jellyfin.name}.${instance.web.domains.url0}";
+              name = "${instances.jellyfin.label} (Internet)";
+              url = "https://${instances.jellyfin.name}.${instances.web.domains.url0}";
               tags = jellyfinTags;
-              keyword = instance.jellyfin.label;
+              keyword = instances.jellyfin.label;
             }
             {
-              name = "${instance.jellyfin.label} (Local)";
-              url = "http://${server.ip.address0}:${toString instance.jellyfin.ports.port1}";
+              name = "${instances.jellyfin.label} (Local)";
+              url = "http://${server.ip.address0}:${toString instances.jellyfin.ports.port1}";
               tags = jellyfinTags;
-              keyword = instance.jellyfin.label;
+              keyword = instances.jellyfin.label;
             }
             {
-              name = instance.mastodon.label;
-              url = "https://${instance.web.domains.url1}";
-              tags = [instance.mastodon.name "mast" "md"];
-              keyword = instance.mastodon.label;
+              name = instances.mastodon.label;
+              url = "https://${instances.web.domains.url1}";
+              tags = [instances.mastodon.name "mast" "md"];
+              keyword = instances.mastodon.label;
             }
             {
               name = "Namecheap";
@@ -254,86 +254,86 @@ in {
               keyword = "Name";
             }
             {
-              name = instance.nextcloud.label;
-              url = "https://${instance.nextcloud.subdomain}.${instance.web.domains.url1}";
-              tags = [instance.nextcloud.name "next" "cloud" "calendar"];
-              keyword = instance.nextcloud.label;
+              name = instances.nextcloud.label;
+              url = "https://${instances.nextcloud.subdomain}.${instances.web.domains.url1}";
+              tags = [instances.nextcloud.name "next" "cloud" "calendar"];
+              keyword = instances.nextcloud.label;
             }
             {
               name = aliases.name2;
-              url = instance.web.domains.url2;
+              url = instances.web.domains.url2;
               tags = [aliases.name3 "blog"];
               keyword = aliases.name2;
             }
             {
-              name = "${instance.ollama.label} (Server)";
-              url = "https://${instance.ollama.subdomain}.${instance.web.domains.url1}";
+              name = "${instances.ollama.label} (Server)";
+              url = "https://${instances.ollama.subdomain}.${instances.web.domains.url1}";
               tags = ollamaTags;
-              keyword = instance.ollama.label;
+              keyword = instances.ollama.label;
             }
             {
-              name = "${instance.ollama.label} (Desktop)";
-              url = "http://localhost:${toString instance.ollama.ports.port0}";
+              name = "${instances.ollama.label} (Desktop)";
+              url = "http://localhost:${toString instances.ollama.ports.port0}";
               tags = ollamaTags;
-              keyword = instance.ollama.label;
+              keyword = instances.ollama.label;
             }
             {
-              name = "${instance.owncast.label} (Admin)";
-              url = "http://${server.ip.address0}:${toString instance.owncast.ports.port0}/admin";
+              name = "${instances.owncast.label} (Admin)";
+              url = "http://${server.ip.address0}:${toString instances.owncast.ports.port0}/admin";
               tags = owncastTags;
-              keyword = instance.owncast.label;
+              keyword = instances.owncast.label;
             }
             {
-              name = "${instance.owncast.label} (Server)";
-              url = "http://${instance.owncast.subdomain}.${instance.web.domains.url1}";
+              name = "${instances.owncast.label} (Server)";
+              url = "http://${instances.owncast.subdomain}.${instances.web.domains.url1}";
               tags = owncastTags;
-              keyword = instance.owncast.label;
+              keyword = instances.owncast.label;
             }
             {
-              name = instance.peertube.label;
-              url = "https://${instance.peertube.subdomain}.${instance.web.domains.url1}";
-              tags = [instance.peertube.name "peer" "tube" "nutrivore"];
-              keyword = instance.peertube.label;
+              name = instances.peertube.label;
+              url = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}";
+              tags = [instances.peertube.name "peer" "tube" "nutrivore"];
+              keyword = instances.peertube.label;
             }
             {
               name = "Router";
-              url = "http://${instance.web.localhost.address2}";
+              url = "http://${instances.web.localhost.address2}";
               tags = ["router" "asus"];
               keyword = "Router";
             }
             {
-              name = "${instance.syncthing.label} (${instance.synology.label})";
-              url = "http://${nas.ip.address0}:${toString instance.syncthing.ports.port0}";
+              name = "${instances.syncthing.label} (${instances.synology.label})";
+              url = "http://${nas.ip.address0}:${toString instances.syncthing.ports.port0}";
               tags =
                 ["synology"]
                 ++ syncthingTags;
-              keyword = instance.syncthing.label;
+              keyword = instances.syncthing.label;
             }
             {
-              name = "${instance.syncthing.label} (Desktop)";
-              url = "http://localhost:${toString instance.syncthing.ports.port0}";
+              name = "${instances.syncthing.label} (Desktop)";
+              url = "http://localhost:${toString instances.syncthing.ports.port0}";
               tags =
                 ["desktop"]
                 ++ syncthingTags;
-              keyword = instance.syncthing.label;
+              keyword = instances.syncthing.label;
             }
             {
-              name = instance.synology.label;
-              url = "https://${nas.ip.address0}:${toString instance.synology.ports.port0}";
-              tags = [instance.synology.name "dsm" "cloud"];
-              keyword = instance.synology.label;
+              name = instances.synology.label;
+              url = "https://${nas.ip.address0}:${toString instances.synology.ports.port0}";
+              tags = [instances.synology.name "dsm" "cloud"];
+              keyword = instances.synology.label;
             }
             {
-              name = instance.vaultwarden.label;
-              url = "https://${instance.vaultwarden.subdomain}.${instance.web.domains.url0}";
-              tags = [instance.vaultwarden.name "bitwarden" "vault" "bit" "warden"];
-              keyword = instance.vaultwarden.label;
+              name = instances.vaultwarden.label;
+              url = "https://${instances.vaultwarden.subdomain}.${instances.web.domains.url0}";
+              tags = [instances.vaultwarden.name "bitwarden" "vault" "bit" "warden"];
+              keyword = instances.vaultwarden.label;
             }
             {
-              name = instance.wiki.label;
-              url = "https://${instance.wiki.subdomain}.${instance.web.domains.url1}";
-              tags = [instance.wiki.name "vault"];
-              keyword = instance.wiki.label;
+              name = instances.wiki.label;
+              url = "https://${instances.wiki.subdomain}.${instances.web.domains.url1}";
+              tags = [instances.wiki.name "vault"];
+              keyword = instances.wiki.label;
             }
           ];
         }
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index 6c32b3f..1f08e3a 100755
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   user = config.home.username;
-  userConfig = flake.config.people.user.${user};
+  userConfig = flake.config.people.users.${user};
 in {
   programs.git = {
     enable = true;
diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix
index 358a948..b9823f4 100755
--- a/nixos/modules/ollama.nix
+++ b/nixos/modules/ollama.nix
@@ -1,5 +1,5 @@
 {flake, ...}: let
-  inherit (flake.config.service.instance) ollama web;
+  inherit (flake.config.services.instances) ollama web;
   service = ollama;
   localhost = web.localhost.address0;
 in {
diff --git a/nixos/modules/printing.nix b/nixos/modules/printing.nix
index 5e24aa5..2ed035c 100755
--- a/nixos/modules/printing.nix
+++ b/nixos/modules/printing.nix
@@ -1,5 +1,5 @@
 {flake, ...}: let
-  inherit (flake.config.system.device) printer0 printer1;
+  inherit (flake.config.machines.devices) printer0 printer1;
   genericPPD = "drv:///sample.drv/generic.ppd";
   pageSize = "Letter";
 in {
diff --git a/nixos/modules/services/acme.nix b/nixos/modules/services/acme.nix
index 0ffac3e..6b500b4 100755
--- a/nixos/modules/services/acme.nix
+++ b/nixos/modules/services/acme.nix
@@ -4,18 +4,18 @@
   ...
 }: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) email;
-  inherit (flake.config.service) instance;
+  inherit (flake.config.people.users.${user0}) email;
+  inherit (flake.config.services) instances;
 
-  domain0 = instance.web.domains.url0;
-  domain1 = instance.web.domains.url1;
-  dns = instance.web.dns.provider0;
+  domain0 = instances.web.domains.url0;
+  domain1 = instances.web.domains.url1;
+  dns = instances.web.dns.provider0;
 
-  instanceName = service: (instance.${service}.subdomain);
+  instanceName = service: (instances.${service}.subdomain);
 
   dnsConfig = {
     dnsProvider = dns;
-    directory = instance.acme.paths.path0;
+    directory = instances.acme.paths.path0;
     environmentFile = config.sops.secrets."dns/namecheap".path;
   };
 in {
@@ -68,7 +68,7 @@ in {
   sops = let
     sopsSecrets = ["pass"];
     sopsPath = secret: {
-      path = "/var/lib/secrets/${instance.acme.name}/${dns}-${secret}";
+      path = "/var/lib/secrets/${instances.acme.name}/${dns}-${secret}";
       owner = "root";
       mode = "600";
     };
diff --git a/nixos/modules/services/caddy.nix b/nixos/modules/services/caddy.nix
index 8c00f8b..d58e392 100755
--- a/nixos/modules/services/caddy.nix
+++ b/nixos/modules/services/caddy.nix
@@ -1,5 +1,5 @@
 {flake, ...}: let
-  inherit (flake.config.service.instance) caddy web;
+  inherit (flake.config.services.instances) caddy web;
 
   domain0 = web.domains.url0;
 
diff --git a/nixos/modules/services/castopod.nix b/nixos/modules/services/castopod.nix
index d0b3e5e..88a619e 100755
--- a/nixos/modules/services/castopod.nix
+++ b/nixos/modules/services/castopod.nix
@@ -3,8 +3,8 @@
   config,
   ...
 }: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) castopod nginx web;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) castopod nginx web;
   service = castopod;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url1}";
diff --git a/nixos/modules/services/forgejo.nix b/nixos/modules/services/forgejo.nix
index 4db63fa..ff97089 100755
--- a/nixos/modules/services/forgejo.nix
+++ b/nixos/modules/services/forgejo.nix
@@ -3,8 +3,8 @@
   config,
   ...
 }: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) forgejo web;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) forgejo web;
   service = forgejo;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url1}";
diff --git a/nixos/modules/services/jellyfin.nix b/nixos/modules/services/jellyfin.nix
index cef605d..9b4d953 100755
--- a/nixos/modules/services/jellyfin.nix
+++ b/nixos/modules/services/jellyfin.nix
@@ -1,7 +1,7 @@
 {flake, ...}: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) jellyfin web;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) jellyfin web;
   service = jellyfin;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url0}";
diff --git a/nixos/modules/services/mastodon/default.nix b/nixos/modules/services/mastodon/default.nix
index 853d601..029e977 100755
--- a/nixos/modules/services/mastodon/default.nix
+++ b/nixos/modules/services/mastodon/default.nix
@@ -5,8 +5,8 @@
   lib,
   ...
 }: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) mastodon web;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) mastodon web;
   service = mastodon;
   host = web.domains.url1;
   localhost = web.localhost.address0;
diff --git a/nixos/modules/services/minecraft.nix b/nixos/modules/services/minecraft.nix
index 9973298..33187c5 100755
--- a/nixos/modules/services/minecraft.nix
+++ b/nixos/modules/services/minecraft.nix
@@ -3,8 +3,8 @@
   flake,
   ...
 }: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) minecraft;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) minecraft;
   service = minecraft;
 in {
   services = {
diff --git a/nixos/modules/services/nextcloud.nix b/nixos/modules/services/nextcloud.nix
index 77af7cd..5e124f9 100755
--- a/nixos/modules/services/nextcloud.nix
+++ b/nixos/modules/services/nextcloud.nix
@@ -5,9 +5,9 @@
   ...
 }: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) name;
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) nextcloud nginx web;
+  inherit (flake.config.people.users.${user0}) name;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) nextcloud nginx web;
   service = nextcloud;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url1}";
diff --git a/nixos/modules/services/ollama.nix b/nixos/modules/services/ollama.nix
index ba640a7..c0ce904 100755
--- a/nixos/modules/services/ollama.nix
+++ b/nixos/modules/services/ollama.nix
@@ -1,6 +1,6 @@
 {flake, ...}: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) ollama web;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) ollama web;
   service = ollama;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url0}";
diff --git a/nixos/modules/services/owncast.nix b/nixos/modules/services/owncast.nix
index be6b508..8b21eb9 100755
--- a/nixos/modules/services/owncast.nix
+++ b/nixos/modules/services/owncast.nix
@@ -1,5 +1,5 @@
 {flake, ...}: let
-  inherit (flake.config.service.instance) owncast web;
+  inherit (flake.config.services.instances) owncast web;
   service = owncast;
   localhost = web.localhost.address1;
   host = "${service.subdomain}.${web.domains.url1}";
diff --git a/nixos/modules/services/peertube.nix b/nixos/modules/services/peertube.nix
index 04aa1e6..d8997aa 100755
--- a/nixos/modules/services/peertube.nix
+++ b/nixos/modules/services/peertube.nix
@@ -4,8 +4,8 @@
   pkgs,
   ...
 }: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) caddy peertube web;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) caddy peertube web;
   service = peertube;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url1}";
diff --git a/nixos/modules/services/postgresql.nix b/nixos/modules/services/postgresql.nix
index e97c0af..217528f 100755
--- a/nixos/modules/services/postgresql.nix
+++ b/nixos/modules/services/postgresql.nix
@@ -1,6 +1,6 @@
 {flake, ...}: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) postgresql;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) postgresql;
 
   service = postgresql;
 in {
diff --git a/nixos/modules/services/samba.nix b/nixos/modules/services/samba.nix
index 92f6b9b..84be831 100755
--- a/nixos/modules/services/samba.nix
+++ b/nixos/modules/services/samba.nix
@@ -3,7 +3,7 @@
   flake,
   ...
 }: let
-  inherit (flake.config.service.instance) samba jellyfin;
+  inherit (flake.config.services.instances) samba jellyfin;
   service = samba;
 in {
   # If you ever need to start fresh, you need to add yourself to the Samba users database:
diff --git a/nixos/modules/services/vaultwarden.nix b/nixos/modules/services/vaultwarden.nix
index 8896368..76a35ad 100755
--- a/nixos/modules/services/vaultwarden.nix
+++ b/nixos/modules/services/vaultwarden.nix
@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  inherit (flake.config.service.instance) vaultwarden web;
+  inherit (flake.config.services.instances) vaultwarden web;
   service = vaultwarden;
   localhost = web.localhost.address0;
   host = "${service.subdomain}.${web.domains.url0}";
diff --git a/nixos/modules/services/wiki.nix b/nixos/modules/services/wiki.nix
index d5ba5a3..1a5a130 100755
--- a/nixos/modules/services/wiki.nix
+++ b/nixos/modules/services/wiki.nix
@@ -3,8 +3,8 @@
   config,
   ...
 }: let
-  inherit (flake.config.system.device) server;
-  inherit (flake.config.service.instance) web wiki;
+  inherit (flake.config.machines.devices) server;
+  inherit (flake.config.services.instances) web wiki;
   service = wiki;
   localhost = web.localhost.address1;
   host = "${service.subdomain}.${web.domains.url1}";
diff --git a/nixos/modules/ssh.nix b/nixos/modules/ssh.nix
index ebc3b48..af8f20b 100755
--- a/nixos/modules/ssh.nix
+++ b/nixos/modules/ssh.nix
@@ -1,6 +1,6 @@
 {flake, ...}: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) sshKeys;
+  inherit (flake.config.people.users.${user0}) sshKeys;
 in {
   users.users.${user0} = {
     openssh.authorizedKeys.keys = sshKeys;
diff --git a/nixos/modules/syncthing.nix b/nixos/modules/syncthing.nix
index 7d1446b..cf54cf4 100755
--- a/nixos/modules/syncthing.nix
+++ b/nixos/modules/syncthing.nix
@@ -1,6 +1,6 @@
 {flake, ...}: let
-  inherit (flake.config.system.device) nas phone tablet;
-  inherit (flake.config.service.instance) syncthing web;
+  inherit (flake.config.machines.devices) nas phone tablet;
+  inherit (flake.config.services.instances) syncthing web;
   service = syncthing;
   localhost = web.localhost.address0;
 in {
diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix
index 1e5cb34..1ad5bf5 100755
--- a/profiles/user0/default.nix
+++ b/profiles/user0/default.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) name paths;
+  inherit (flake.config.people.users.${user0}) name paths;
 
   hostname = config.networking.hostName;
 in {
diff --git a/profiles/user1/default.nix b/profiles/user1/default.nix
index 81e6783..d68a079 100755
--- a/profiles/user1/default.nix
+++ b/profiles/user1/default.nix
@@ -6,7 +6,7 @@
 }: let
   hostname = config.networking.hostName;
   inherit (flake.config.people) user1;
-  inherit (flake.config.people.user.${user1}) name;
+  inherit (flake.config.people.users.${user1}) name;
 in {
   users = {
     users.${user1} = {
diff --git a/systems/desktop/filesystem.nix b/systems/desktop/filesystem.nix
index 42ce3aa..7bbedf0 100755
--- a/systems/desktop/filesystem.nix
+++ b/systems/desktop/filesystem.nix
@@ -4,8 +4,8 @@
   ...
 }: let
   inherit (flake.config.people) user0 user1;
-  inherit (flake.config.system.device) desktop server nas;
-  inherit (flake.config.service.instance) samba;
+  inherit (flake.config.machines.devices) desktop server nas;
+  inherit (flake.config.services.instances) samba;
 
   synologySecrets = config.sops.secrets."network/synology".path;
   serverSecrets = config.sops.secrets."network/server".path;
diff --git a/systems/desktop/networking.nix b/systems/desktop/networking.nix
index 705a059..dd8720d 100755
--- a/systems/desktop/networking.nix
+++ b/systems/desktop/networking.nix
@@ -3,7 +3,7 @@
   flake,
   ...
 }: let
-  inherit (flake.config.system.device) desktop;
+  inherit (flake.config.machines.devices) desktop;
 in {
   networking = {
     hostName = desktop.name;
diff --git a/systems/desktop/sops.nix b/systems/desktop/sops.nix
index 0e5db1f..76dfc6d 100755
--- a/systems/desktop/sops.nix
+++ b/systems/desktop/sops.nix
@@ -1,6 +1,6 @@
 {flake, ...}: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) paths;
+  inherit (flake.config.people.users.${user0}) paths;
 in {
   sops = {
     secrets = {
diff --git a/systems/laptop/filesystem.nix b/systems/laptop/filesystem.nix
index 683afd9..2220b9e 100755
--- a/systems/laptop/filesystem.nix
+++ b/systems/laptop/filesystem.nix
@@ -4,8 +4,8 @@
   ...
 }: let
   inherit (flake.config.people) user0 user1;
-  inherit (flake.config.system.device) laptop nas server;
-  inherit (flake.config.service.instance) samba;
+  inherit (flake.config.machines.devices) laptop nas server;
+  inherit (flake.config.services.instances) samba;
 
   synologySecrets = config.sops.secrets."network/synology".path;
   serverSecrets = config.sops.secrets."network/server".path;
diff --git a/systems/laptop/networking.nix b/systems/laptop/networking.nix
index 896c738..371229c 100755
--- a/systems/laptop/networking.nix
+++ b/systems/laptop/networking.nix
@@ -3,7 +3,7 @@
   flake,
   ...
 }: let
-  inherit (flake.config.system.device) laptop;
+  inherit (flake.config.machines.devices) laptop;
 in {
   networking = {
     hostName = laptop.name;
diff --git a/systems/server/filesystem.nix b/systems/server/filesystem.nix
index 9b0a32d..ab2306a 100755
--- a/systems/server/filesystem.nix
+++ b/systems/server/filesystem.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (flake.config.people) user0;
-  inherit (flake.config.system.device) server;
+  inherit (flake.config.machines.devices) server;
 in {
   fileSystems = let
     storageDrives = [
diff --git a/systems/server/networking.nix b/systems/server/networking.nix
index a78d695..cc01bb3 100755
--- a/systems/server/networking.nix
+++ b/systems/server/networking.nix
@@ -3,7 +3,7 @@
   flake,
   ...
 }: let
-  inherit (flake.config.system.device) server;
+  inherit (flake.config.machines.devices) server;
 in {
   networking = {
     hostName = server.name;