diff --git a/common/default.nix b/common/default.nix
index 46c8b18..40c6927 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,6 +1,8 @@
-{ config, lib, pkgs, nixpkgs, ... }: {
+{ config, lib, pkgs, inputs, ... }: {
   imports = [
     ./users.nix
+    # Monitoring is applicable to all hosts, thus placing it here
+    ../services/monitoring
   ];
 
   environment.systemPackages = with pkgs; [
@@ -19,7 +21,7 @@
     package = pkgs.nixVersions.stable;
     settings.auto-optimise-store = lib.mkDefault true;
     settings.trusted-users = [ "root" "@wheel" ];
-    registry.nixpkgs.flake = nixpkgs;
+    registry.nixpkgs.flake = inputs.nixpkgs;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
diff --git a/flake.nix b/flake.nix
index 913bdd0..87fa0c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,8 @@
       {
         nixpkgs.overlays = [ overlay ];
         _module.args = {
-          inherit nixpkgs;
+          inherit inputs;
+          outputs = self;
         };
       }
     ];