diff --git a/suites/default.nix b/suites/default.nix
index 7eb11e503..32e274baa 100644
--- a/suites/default.nix
+++ b/suites/default.nix
@@ -5,19 +5,15 @@ let
   profiles = dev.os.mkProfileAttrs (toString ../profiles);
   users = dev.os.mkProfileAttrs (toString ../users);
 
-  allProfiles =
-    let defaults = lib.collect (x: x ? default) profiles;
-    in map (x: x.default) defaults;
+  allProfiles = dev.os.profileMap profiles;
 
-  allUsers =
-    let defaults = lib.collect (x: x ? default) users;
-    in map (x: x.default) defaults;
+  allUsers = dev.os.profileMap users;
 
 
   suites = with profiles; rec {
-    base = [ users.nixos users.root ];
+    base = dev.os.profileMap [ users.nixos users.root ];
   };
 in
-lib.mapAttrs (_: v: dev.os.profileMap v) suites // {
+suites // {
   inherit allProfiles allUsers;
 }