diff --git a/flake.nix b/flake.nix
index 32a274f..63069cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,7 +68,11 @@
       ];
     };
 
-    nixosConfigurations."dregil" = import ./hosts/dregil { inherit inputs; };
+    nixosConfigurations."dregil" = nixpkgs-unstable.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [ ./hosts/dregil ];
+    };
     homeConfigurations = import ./outputs/homeConfigurations inputs;
 
     nixOnDroidConfigurations.default = with inputs;
diff --git a/home/cli.nix b/home/cli.nix
index 44777d0..5e9fef0 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -60,7 +60,6 @@ in {
     (aspellWithDicts (dicts: with dicts; [ en en-computers en-science de ]))
 
     # system tools
-    btop
     htop-vim # htop with vim bindings
     erdtree # du+tree had sex
     dua # ncdu but better
@@ -117,6 +116,9 @@ in {
     # better cat
     bat.enable = true;
 
+    # htop replacement with a nice UI
+    btop.enable = true;
+
     zsh = {
       enable = true;
       enableAutosuggestions = true;
diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix
index 1a54eaa..a2a7861 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -32,6 +32,10 @@ in {
   networking.networkmanager.enable =
     true; # Easiest to use and most distros use this by default.
 
+  networking.extraHosts = ''
+    127.0.0.1 localhost dregil.localdomain dregil
+  '';
+
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@@ -121,6 +125,9 @@ in {
   environment.etc."nix/inputs/nixpkgs".source = inputs.nixpkgs-unstable.outPath;
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs-unstable}" ];
 
+  nix.settings.max-jobs = 3;
+  nix.settings.cores = 4;
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix
index f76b4f6..2f65274 100644
--- a/hosts/dregil/default.nix
+++ b/hosts/dregil/default.nix
@@ -1,17 +1,12 @@
-{ inputs, ... }:
-let
-  inherit (inputs.nixpkgs-unstable.lib) nixosSystem;
-
-  system = "x86_64-linux";
-
-  pkgs = import inputs.nixpkgs-unstable {
-    inherit system;
-    config = { allowUnfree = true; };
-  };
-in nixosSystem {
-  inherit system pkgs;
-  specialArgs = { inherit inputs; };
-  modules = [
+{ lib, config, pkgs, inputs, ... }: {
+  imports = [
+    ({ inputs, lib, ... }: {
+      nixpkgs = {
+        config.allowUnfree = true;
+        overlays = with inputs; [ emacs.overlay ];
+      };
+      nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
+    })
     ../../modules/security.nix
     ../../modules/common-system.nix
     ./configuration.nix