diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix
index ced254b1819c..3e5d516271bc 100644
--- a/nixos/tests/alps.nix
+++ b/nixos/tests/alps.nix
@@ -61,7 +61,7 @@ in
           certs.ca.cert
         ];
         networking.extraHosts = ''
-          ${nodes.server.config.networking.primaryIPAddress} ${domain}
+          ${nodes.server.networking.primaryIPAddress} ${domain}
         '';
         services.alps = {
           enable = true;
@@ -83,7 +83,7 @@ in
 
             baseurl = "http://localhost:${toString config.services.alps.port}"
             username = "alice"
-            password = "${nodes.server.config.users.users.alice.password}"
+            password = "${nodes.server.users.users.alice.password}"
             cookiejar = CookieJar()
             cookieprocessor = HTTPCookieProcessor(cookiejar)
             opener = build_opener(cookieprocessor)
@@ -125,7 +125,7 @@ in
 
       client.start()
       client.wait_for_unit("alps.service")
-      client.wait_for_open_port(${toString nodes.client.config.services.alps.port})
+      client.wait_for_open_port(${toString nodes.client.services.alps.port})
       client.succeed("test-alps-login")
     '';
 }
diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix
index 10fe997a71d7..fa0c8125862d 100644
--- a/nixos/tests/cage.nix
+++ b/nixos/tests/cage.nix
@@ -29,7 +29,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       with subtest("Wait for cage to boot up"):
diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix
index 13012281a151..7a2c0a381836 100644
--- a/nixos/tests/cagebreak.nix
+++ b/nixos/tests/cagebreak.nix
@@ -47,7 +47,7 @@ in
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       XDG_RUNTIME_DIR = "/run/user/${toString user.uid}";
     in
     ''
diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix
index 8dceda8db4c6..7465813775e0 100644
--- a/nixos/tests/containers-ip.nix
+++ b/nixos/tests/containers-ip.nix
@@ -47,9 +47,9 @@ in
           # need to distinguish because show-ip won't work for ipv6
           if container == "webserver4":
               ip = machine.succeed(f"nixos-container show-ip {container}").rstrip()
-              assert ip == "${nodes.machine.config.containers.webserver4.localAddress}"
+              assert ip == "${nodes.machine.containers.webserver4.localAddress}"
               return ip
-          return "${nodes.machine.config.containers.webserver6.localAddress}"
+          return "${nodes.machine.containers.webserver6.localAddress}"
 
 
       for container in "webserver4", "webserver6":
diff --git a/nixos/tests/docker-rootless.nix b/nixos/tests/docker-rootless.nix
index fcd33476ae45..17fec3e04f65 100644
--- a/nixos/tests/docker-rootless.nix
+++ b/nixos/tests/docker-rootless.nix
@@ -22,7 +22,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       sudo = lib.concatStringsSep " " [
         "XDG_RUNTIME_DIR=/run/user/${toString user.uid}"
         "DOCKER_HOST=unix:///run/user/${toString user.uid}/docker.sock"
diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix
index 41dfc754e7fe..e5e6589976f6 100644
--- a/nixos/tests/enlightenment.nix
+++ b/nixos/tests/enlightenment.nix
@@ -33,7 +33,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       with subtest("Ensure x starts"):
diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix
index 90723bdbb604..08cd0c0f3f30 100644
--- a/nixos/tests/iscsi-multipath-root.nix
+++ b/nixos/tests/iscsi-multipath-root.nix
@@ -126,7 +126,7 @@ in
         ];
 
         environment.etc."initiator-root-disk-closure".source =
-          nodes.initiatorRootDisk.config.system.build.toplevel;
+          nodes.initiatorRootDisk.system.build.toplevel;
 
         nix.settings = {
           substituters = lib.mkForce [ ];
diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix
index 571dbecad244..6872dfbda94c 100644
--- a/nixos/tests/iscsi-root.nix
+++ b/nixos/tests/iscsi-root.nix
@@ -169,7 +169,7 @@ in
       initiatorAuto.succeed("mkfs.xfs /dev/sda")
       initiatorAuto.succeed("mkdir /mnt && mount /dev/sda /mnt")
       initiatorAuto.succeed(
-          "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.config.system.build.toplevel}"
+          "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.system.build.toplevel}"
       )
       initiatorAuto.succeed("umount /mnt && rmdir /mnt")
       initiatorAuto.shutdown()
diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix
index f12141d94627..e399bf0c3d67 100644
--- a/nixos/tests/kerberos/heimdal.nix
+++ b/nixos/tests/kerberos/heimdal.nix
@@ -169,7 +169,7 @@ import ../make-test-python.nix (
         with subtest("Server: initialize host principal with keytab"):
           server.send_chars("sudo ktutil get -p alice/admin host/server.foo.bar\n")
           server.wait_until_tty_matches("1", "password for alice:")
-          server.send_chars("${nodes.server.config.users.users.alice.password}\n")
+          server.send_chars("${nodes.server.users.users.alice.password}\n")
           server.wait_until_tty_matches("1", "alice/admin@FOO.BAR's Password:")
           server.send_chars(f'{alice_krb_admin_pw}\n')
           server.wait_for_file("/etc/krb5.keytab")
@@ -194,7 +194,7 @@ import ../make-test-python.nix (
 
           client.send_chars("sudo ktutil get -p alice/admin host/client.foo.bar\n")
           client.wait_until_tty_matches("1", "password for alice:")
-          client.send_chars("${nodes.client.config.users.users.alice.password}\n")
+          client.send_chars("${nodes.client.users.users.alice.password}\n")
           client.wait_until_tty_matches("1", "alice/admin@FOO.BAR's Password:")
           client.send_chars(f"{alice_krb_admin_pw}\n")
           client.wait_for_file("/etc/krb5.keytab")
diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix
index 651fccc21949..3c6217195464 100644
--- a/nixos/tests/knot.nix
+++ b/nixos/tests/knot.nix
@@ -209,11 +209,11 @@ in
   testScript =
     { nodes, ... }:
     let
-      primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address;
-      primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address;
+      primary4 = (lib.head nodes.primary.networking.interfaces.eth1.ipv4.addresses).address;
+      primary6 = (lib.head nodes.primary.networking.interfaces.eth1.ipv6.addresses).address;
 
-      secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address;
-      secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address;
+      secondary4 = (lib.head nodes.secondary.networking.interfaces.eth1.ipv4.addresses).address;
+      secondary6 = (lib.head nodes.secondary.networking.interfaces.eth1.ipv6.addresses).address;
     in
     ''
       import re
diff --git a/nixos/tests/libuiohook.nix b/nixos/tests/libuiohook.nix
index 34a200bd0349..47114bcd8e88 100644
--- a/nixos/tests/libuiohook.nix
+++ b/nixos/tests/libuiohook.nix
@@ -8,7 +8,7 @@
   nodes.client =
     { nodes, ... }:
     let
-      user = nodes.client.config.users.users.alice;
+      user = nodes.client.users.users.alice;
     in
     {
       imports = [
@@ -24,7 +24,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.client.config.users.users.alice;
+      user = nodes.client.users.users.alice;
     in
     ''
       client.wait_for_x()
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index 3d51924af8de..f561f89df221 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -20,7 +20,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       start_all()
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index 747d691a87d6..04e9fd7f1ba4 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -21,7 +21,7 @@ in
       {
         imports = [ common ];
         networking.nameservers = lib.mkForce [
-          (lib.head nodes.server.config.networking.interfaces.eth1.ipv4.addresses).address
+          (lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address
         ];
         networking.interfaces.eth1.ipv4.addresses = [
           {
@@ -36,7 +36,7 @@ in
       {
         imports = [ common ];
         networking.nameservers = lib.mkForce [
-          (lib.head nodes.server.config.networking.interfaces.eth1.ipv6.addresses).address
+          (lib.head nodes.server.networking.interfaces.eth1.ipv6.addresses).address
         ];
         networking.interfaces.eth1.ipv4.addresses = [
           {
diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix
index 6018e2eef172..162d8b315a8b 100644
--- a/nixos/tests/parsedmarc/default.nix
+++ b/nixos/tests/parsedmarc/default.nix
@@ -93,8 +93,8 @@ in
     testScript =
       { nodes, ... }:
       let
-        esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;
-        valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
+        esPort = toString nodes.parsedmarc.services.elasticsearch.port;
+        valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.services.elasticsearch.package.version "7") ".value";
       in
       ''
         parsedmarc.start()
@@ -143,7 +143,7 @@ in
 
             networking.extraHosts = ''
               127.0.0.1 ${parsedmarcDomain}
-              ${nodes.mail.config.networking.primaryIPAddress} ${mailDomain}
+              ${nodes.mail.networking.primaryIPAddress} ${mailDomain}
             '';
 
             services.parsedmarc = {
@@ -170,7 +170,7 @@ in
 
             networking.extraHosts = ''
               127.0.0.1 ${mailDomain}
-              ${nodes.parsedmarc.config.networking.primaryIPAddress} ${parsedmarcDomain}
+              ${nodes.parsedmarc.networking.primaryIPAddress} ${parsedmarcDomain}
             '';
 
             services.dovecot2 = {
@@ -204,8 +204,8 @@ in
       testScript =
         { nodes, ... }:
         let
-          esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;
-          valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
+          esPort = toString nodes.parsedmarc.services.elasticsearch.port;
+          valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.services.elasticsearch.package.version "7") ".value";
         in
         ''
           mail.start()
diff --git a/nixos/tests/pass-secret-service.nix b/nixos/tests/pass-secret-service.nix
index 57c7ac8bdcbc..6ef896f78bf2 100644
--- a/nixos/tests/pass-secret-service.nix
+++ b/nixos/tests/pass-secret-service.nix
@@ -39,7 +39,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       gpg-uid = "alice@example.net";
       gpg-pw = "foobar9000";
       ready-file = "/tmp/secrets-dbus-init.done";
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index f051d429a508..1e76c7811c79 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -41,8 +41,8 @@ in
 
               <Proxy balancer://cluster>
                 Require all granted
-                BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
-                BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
+                BalancerMember http://${nodes.backend1.networking.hostName} retry=0
+                BalancerMember http://${nodes.backend2.networking.hostName} retry=0
               </Proxy>
 
               ProxyStatus       full
diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix
index e7a552b9e536..ce7fecdb143b 100644
--- a/nixos/tests/service-runner.nix
+++ b/nixos/tests/service-runner.nix
@@ -29,7 +29,7 @@
           machine.succeed(
               """
               mkdir -p /run/nginx /var/log/nginx /var/cache/nginx
-              ${nodes.machine.config.systemd.services.nginx.runner} >&2 &
+              ${nodes.machine.systemd.services.nginx.runner} >&2 &
               echo $!>my-nginx.pid
               """
           )
diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix
index 398f8603308c..a6c5d08c0d30 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@@ -42,7 +42,7 @@ in
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
     in
     ''
       start_all()
diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix
index 6de050418592..6427d688db7d 100644
--- a/nixos/tests/sway.nix
+++ b/nixos/tests/sway.nix
@@ -194,7 +194,7 @@
       swaymsg("exec swaylock")
       machine.wait_until_succeeds("pgrep -xf swaylock")
       machine.sleep(3)
-      machine.send_chars("${nodes.machine.config.users.users.alice.password}")
+      machine.send_chars("${nodes.machine.users.users.alice.password}")
       machine.send_key("ret")
       machine.wait_until_fails("pgrep -xf swaylock")
 
diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix
index 5f0edd0ddfba..b4b58a8e60b9 100644
--- a/nixos/tests/thanos.nix
+++ b/nixos/tests/thanos.nix
@@ -322,7 +322,7 @@ in
       # and check if the blocks have the correct labels:
       store.succeed(
           "thanos tools bucket ls "
-          + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} "
+          + "--objstore.config-file=${nodes.store.services.thanos.store.objstore.config-file} "
           + "--output=json | "
           + "jq .thanos.labels.some_label | "
           + "grep 'required by thanos'"
diff --git a/nixos/tests/txredisapi.nix b/nixos/tests/txredisapi.nix
index 171d3efee78f..57a32e624c24 100644
--- a/nixos/tests/txredisapi.nix
+++ b/nixos/tests/txredisapi.nix
@@ -25,7 +25,7 @@
   testScript =
     { nodes, ... }:
     let
-      inherit (nodes.machine.config.services) redis;
+      inherit (nodes.machine.services) redis;
     in
     ''
       start_all()
diff --git a/nixos/tests/xrdp-with-audio-pulseaudio.nix b/nixos/tests/xrdp-with-audio-pulseaudio.nix
index cc630143b990..813dc6193c05 100644
--- a/nixos/tests/xrdp-with-audio-pulseaudio.nix
+++ b/nixos/tests/xrdp-with-audio-pulseaudio.nix
@@ -73,7 +73,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.client.config.users.users.alice;
+      user = nodes.client.users.users.alice;
     in
     ''
       start_all()