diff --git a/flake.nix b/flake.nix
index 27f523d..5443acd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,97 +2,99 @@
   description =
     "A collection of crap, hacks and copy-paste to make my localhosts boot";
 
-  inputs = {
-    nixpkgs-mopidy = {
-      type = "github";
-      owner = "NickHU";
-      repo = "nixpkgs";
-      ref = "mopidy";
-      flake = false;
+    inputs = {
+      nixpkgs-mopidy = {
+        type = "github";
+        owner = "NickHU";
+        repo = "nixpkgs";
+        ref = "mopidy";
+        flake = false;
+      };
+      NUR = {
+        type = "github";
+        owner = "nix-community";
+        repo = "NUR";
+        flake = false;
+      };
+      base16-unclaimed-schemes = {
+        type = "github";
+        owner = "chriskempson";
+        repo = "base16-unclaimed-schemes";
+        flake = false;
+      };
+      home-manager = {
+        type = "github";
+        owner = "rycee";
+        repo = "home-manager";
+        ref = "bqv-flakes";
+      };
+      materia-theme = {
+        type = "github";
+        owner = "nana-4";
+        repo = "materia-theme";
+        flake = false;
+      };
+      nixpkgs-old = {
+        type = "github";
+        owner = "nixos";
+        repo = "nixpkgs";
+        ref = "nixos-19.03";
+        flake = false;
+      };
+      weechat-scripts = {
+        type = "github";
+        owner = "weechat";
+        repo = "scripts";
+        flake = false;
+      };
+      simple-nixos-mailserver = {
+        type = "git";
+        url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver";
+        ref = "master";
+        flake = false;
+      };
+      nixpkgs-wayland = {
+        type = "github";
+        owner = "colemickens";
+        repo = "nixpkgs-wayland";
+        flake = false;
+      };
+      weechat-notify-send = {
+        type = "github";
+        owner = "s3rvac";
+        repo = "weechat-notify-send";
+        flake = false;
+      };
+      yt-utilities = {
+        type = "git";
+        url = "ssh://git@github.com/serokell/yt-utilities";
+        ref = "flake";
+      };
+      mobile-broadband-provider-info = {
+        type = "git";
+        url = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info";
+        flake = false;
+      };
+      nixos-fhs-compat = {
+        type = "github";
+        owner = "balsoft";
+        repo = "nixos-fhs-compat";
+      };
     };
-    NUR = {
-      type = "github";
-      owner = "nix-community";
-      repo = "NUR";
-      flake = false;
-    };
-    base16-unclaimed-schemes = {
-      type = "github";
-      owner = "chriskempson";
-      repo = "base16-unclaimed-schemes";
-      flake = false;
-    };
-    home-manager = {
-      type = "github";
-      owner = "rycee";
-      repo = "home-manager";
-      ref = "bqv-flakes";
-    };
-    materia-theme = {
-      type = "github";
-      owner = "nana-4";
-      repo = "materia-theme";
-      flake = false;
-    };
-    nixpkgs-old = {
-      type = "github";
-      owner = "nixos";
-      repo = "nixpkgs";
-      ref = "nixos-19.03";
-      flake = false;
-    };
-    weechat-scripts = {
-      type = "github";
-      owner = "weechat";
-      repo = "scripts";
-      flake = false;
-    };
-    simple-nixos-mailserver = {
-      type = "git";
-      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver";
-      ref = "master";
-      flake = false;
-    };
-    nixpkgs-wayland = {
-      type = "github";
-      owner = "colemickens";
-      repo = "nixpkgs-wayland";
-      flake = false;
-    };
-    weechat-notify-send = {
-      type = "github";
-      owner = "s3rvac";
-      repo = "weechat-notify-send";
-      flake = false;
-    };
-    yt-utilities = {
-      type = "git";
-      url = "ssh://git@github.com/serokell/yt-utilities";
-      ref = "flake";
-    };
-    mobile-broadband-provider-info = {
-      type = "git";
-      url = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info";
-      flake = false;
-    };
-    nixos-fhs-compat = {
-      type = "github";
-      owner = "balsoft";
-      repo = "nixos-fhs-compat";
-    };
-  };
 
-  outputs = { nixpkgs, nix, ... }@inputs: {
-    nixosConfigurations = with nixpkgs.lib;
+    outputs = { nixpkgs, nix, self, ... }@inputs: {
+      nixosConfigurations = with nixpkgs.lib;
       let
         hosts = map (fname: builtins.head (builtins.match "(.*)\\.nix" fname))
-          (builtins.attrNames (builtins.readDir ./hardware-configuration));
+        (builtins.attrNames (builtins.readDir ./hardware-configuration));
         mkHost = name:
-          nixosSystem {
-            system = "x86_64-linux";
-            modules = [ (import ./default.nix) ];
-            specialArgs = { inherit inputs name; };
-          };
+        nixosSystem {
+          system = "x86_64-linux";
+          modules = [ (import ./default.nix) ];
+          specialArgs = { inherit inputs name; };
+        };
       in genAttrs hosts mkHost;
-  };
+      legacyPackages.x86_64-linux =
+        (builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs;
+    };
 }
diff --git a/modules/packages.nix b/modules/packages.nix
index 2651afc..82de8a3 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -25,6 +25,8 @@ in {
 
         inherit (old) mautrix-telegram;
 
+        inherit old;
+
         yt-utilities =
           import (self.fetchgit config.secrets.yt-utilities.source) { };
 
@@ -56,10 +58,7 @@ in {
     ];
     binaryCaches = [ "https://cache.nixos.org" "https://cache.balsoft.ru" ];
 
-    registry.nixpkgs = {
-      from = { id = "nixpkgs"; type = "indirect"; };
-      flake = inputs.nixpkgs;
-    };
+    registry.self.flake = inputs.self;
 
     trustedUsers = [ "root" "balsoft" "@wheel" ];