diff --git a/flake.nix b/flake.nix
index 63069cd..32a274f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,11 +68,7 @@
       ];
     };
 
-    nixosConfigurations."dregil" = nixpkgs-unstable.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
-      modules = [ ./hosts/dregil ];
-    };
+    nixosConfigurations."dregil" = import ./hosts/dregil { inherit inputs; };
     homeConfigurations = import ./outputs/homeConfigurations inputs;
 
     nixOnDroidConfigurations.default = with inputs;
diff --git a/home/cli.nix b/home/cli.nix
index 5e9fef0..44777d0 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -60,6 +60,7 @@ 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
@@ -116,9 +117,6 @@ 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 a2a7861..1a54eaa 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -32,10 +32,6 @@ 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";
@@ -125,9 +121,6 @@ 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 2f65274..f76b4f6 100644
--- a/hosts/dregil/default.nix
+++ b/hosts/dregil/default.nix
@@ -1,12 +1,17 @@
-{ lib, config, pkgs, inputs, ... }: {
-  imports = [
-    ({ inputs, lib, ... }: {
-      nixpkgs = {
-        config.allowUnfree = true;
-        overlays = with inputs; [ emacs.overlay ];
-      };
-      nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
-    })
+{ 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 = [
     ../../modules/security.nix
     ../../modules/common-system.nix
     ./configuration.nix