diff --git a/home/programs/mopidy.nix b/home/programs/mopidy.nix
index 48fd505..841921a 100644
--- a/home/programs/mopidy.nix
+++ b/home/programs/mopidy.nix
@@ -21,6 +21,7 @@ in
         mopidy-soundcloud
         mopidy-scrobbler
         # outputs.packages.${pkgs.system}.mopidy-autoplay
+        mopidy-autoplay
       ];
     };
     home.packages = with pkgs; [
diff --git a/system/common/desktop.nix b/system/common/desktop.nix
index 5779eba..9357630 100644
--- a/system/common/desktop.nix
+++ b/system/common/desktop.nix
@@ -48,7 +48,7 @@ in
     fonts.packages = with pkgs; [
       (nerdfonts.override { fonts = [ "FiraCode" ]; })
       noto-fonts-cjk
-      (outputs.packages.${pkgs.system}.google-fonts.override { fonts = [ "NovaSquare" ];})
+      google-fonts.override { fonts = [ "NovaSquare" ];}
     ];
 
     # TODO this should be defined in home-manager or not at all probably
diff --git a/system/profile/base.nix b/system/profile/base.nix
index 90f16fa..86eab3a 100644
--- a/system/profile/base.nix
+++ b/system/profile/base.nix
@@ -94,7 +94,7 @@ in
 
         # etc
         neofetch
-        outputs.packages."${pkgs.system}".atool
+        atool-wrapped
       ];
 
       # Needed for Kvantum themes to be detected