diff --git a/flake.nix b/flake.nix
index cb6388b..f0b0562 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,19 +20,16 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro }:
+  outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro, ... } @ inputs:
     let
       defaultModules = [
-        ({ pkgs, ... }: {
-          nixpkgs.overlays = [ rustybar.overlay ];
-        })
         private.nixosModules.base
         home-manager.nixosModules.home-manager
       ];
       makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate
         {
           specialArgs = {
-            inherit rustybar;
+            inherit inputs;
           };
         }
         conf);
diff --git a/home/default.nix b/home/default.nix
index a7552da..95bdbdc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 
 {
   home-manager = {
@@ -6,6 +6,7 @@
     useGlobalPkgs = true;
   };
   home-manager.users.artemis = {
+    extraSpecialArgs.inputs = inputs;
     imports = [
       ./git.nix
       ./mpv.nix
diff --git a/home/sway.nix b/home/sway.nix
index 46c5381..0f7dcd7 100644
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -1,5 +1,6 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, config, inputs, ... }:
 let
+  rustybar = inputs.rustybar.defaultPackage."${pkgs.system}";
   cfg = config.wayland.windowManager.sway;
   mod = cfg.config.modifier;
   extraWorkspaces = {
@@ -88,7 +89,7 @@ in
       window.titlebar = true;
 
       bars = [{
-        statusCommand = "${pkgs.rustybar}/bin/rustybar";
+        statusCommand = "${rustybar}/bin/rustybar";
         position = "top";
         fonts = cfg.config.fonts;
         colors = {