diff --git a/flake.nix b/flake.nix
index d82b7fe..acfcfbe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,11 +46,11 @@
             
             extraPkgs = p: with p; [
               glib gtk3 cairo pango atk gdk-pixbuf
-              xorg.libX11 xorg.libXcomposite xorg.libXcursor
-              xorg.libXext xorg.libXfixes xorg.libXi
-              xorg.libXrandr xorg.libXrender xorg.libXtst
+              libx11 libxcomposite libxcursor
+              libxext libxfixes libxi
+              libxrandr libxrender libxtst
               nss nspr dbus at-spi2-atk at-spi2-core
-              mesa alsa-lib fuse libxkbcommon xorg.libxkbfile
+              mesa alsa-lib fuse libxkbcommon libxkbfile
             ];
           };
         in
@@ -134,7 +134,7 @@
 
       # Overlay for easy integration into other flakes
       overlays.default = final: prev: {
-        cursor = self.packages.${final.system}.cursor;
+        cursor = self.packages.${final.stdenv.hostPlatform.system}.cursor;
       };
     };
 }