diff --git a/modules/environment/default.nix b/modules/environment/default.nix
index bb996222..3b97a3ec 100644
--- a/modules/environment/default.nix
+++ b/modules/environment/default.nix
@@ -9,7 +9,7 @@ let
     mapAttrsToList (n: v: ''export ${n}="${v}"'') cfg.variables;
 
   aliasCommands =
-    mapAttrsFlatten (n: v: ''alias ${n}=${escapeShellArg v}'')
+    mapAttrsToList (n: v: ''alias ${n}=${escapeShellArg v}'')
       (filterAttrs (k: v: v != null) cfg.shellAliases);
 
   makeDrvBinPath = concatMapStringsSep ":" (p: if isDerivation p then "${p}/bin" else p);
diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 77276e67..4b76e02e 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -9,7 +9,7 @@ let
   cfg = config.programs.fish;
 
   fishAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}")
+    mapAttrsToList (k: v: "alias ${k} ${escapeShellArg v}")
       (filterAttrs (k: v: v != null) cfg.shellAliases)
   );