diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 7a2ad665e09d7d2..bc61a2ab174d9af 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -36,7 +36,7 @@ let
 
   # Select the appropriate stages for the platform `system'.
 in
-  if crossSystem != localSystem || crossOverlays != [] then stagesCross
+  if !lib.systems.equals crossSystem localSystem || crossOverlays != [] then stagesCross
   else if config ? replaceStdenv then stagesCustom
   else if localSystem.isLinux then stagesLinux
   else if localSystem.isDarwin then stagesDarwin
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 9cfe21e3640d48e..fb0bc94ad4ca354 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -95,7 +95,7 @@
   in files
 }:
 
-assert crossSystem == localSystem;
+assert lib.systems.equals crossSystem localSystem;
 
 let
   inherit (localSystem) system;