diff --git a/outputs/aarch64-linux/tests/security-firewall/expected.nix b/outputs/aarch64-linux/tests/security-firewall/expected.nix
index bf428c90..6ca2c34e 100644
--- a/outputs/aarch64-linux/tests/security-firewall/expected.nix
+++ b/outputs/aarch64-linux/tests/security-firewall/expected.nix
@@ -1,7 +1,7 @@
-{ outputs, ... }:
-let
-  inherit (outputs) nixosConfigurations;
-in
-builtins.mapAttrs (name: {
-  enabled = name == "ai-niri" || name == "shoukei-niri";
-}) nixosConfigurations
+{
+  lib,
+  outputs,
+}:
+lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (
+  name: name == "ai-niri" || name == "shoukei-niri"
+)
diff --git a/outputs/aarch64-linux/tests/security-firewall/expr.nix b/outputs/aarch64-linux/tests/security-firewall/expr.nix
index 8423c4e8..39873f63 100644
--- a/outputs/aarch64-linux/tests/security-firewall/expr.nix
+++ b/outputs/aarch64-linux/tests/security-firewall/expr.nix
@@ -1,7 +1,7 @@
-{ outputs, ... }:
-let
-  inherit (outputs) nixosConfigurations;
-in
-builtins.mapAttrs (name: {
-  enabled = nixosConfigurations.${name}.config.networking.firewall.enable;
-}) nixosConfigurations
+{
+  lib,
+  outputs,
+}:
+lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (
+  name: outputs.nixosConfigurations.${name}.config.networking.firewall.enable
+)
diff --git a/outputs/x86_64-linux/tests/security-firewall/expected.nix b/outputs/x86_64-linux/tests/security-firewall/expected.nix
index bf428c90..6ca2c34e 100644
--- a/outputs/x86_64-linux/tests/security-firewall/expected.nix
+++ b/outputs/x86_64-linux/tests/security-firewall/expected.nix
@@ -1,7 +1,7 @@
-{ outputs, ... }:
-let
-  inherit (outputs) nixosConfigurations;
-in
-builtins.mapAttrs (name: {
-  enabled = name == "ai-niri" || name == "shoukei-niri";
-}) nixosConfigurations
+{
+  lib,
+  outputs,
+}:
+lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (
+  name: name == "ai-niri" || name == "shoukei-niri"
+)
diff --git a/outputs/x86_64-linux/tests/security-firewall/expr.nix b/outputs/x86_64-linux/tests/security-firewall/expr.nix
index 8423c4e8..39873f63 100644
--- a/outputs/x86_64-linux/tests/security-firewall/expr.nix
+++ b/outputs/x86_64-linux/tests/security-firewall/expr.nix
@@ -1,7 +1,7 @@
-{ outputs, ... }:
-let
-  inherit (outputs) nixosConfigurations;
-in
-builtins.mapAttrs (name: {
-  enabled = nixosConfigurations.${name}.config.networking.firewall.enable;
-}) nixosConfigurations
+{
+  lib,
+  outputs,
+}:
+lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (
+  name: outputs.nixosConfigurations.${name}.config.networking.firewall.enable
+)