diff --git a/system/configuration.nix b/system/configuration.nix
index ee3f630..9f98a76 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -4,7 +4,7 @@
 
 { config, pkgs, lib, ... }:
 
-{
+rec {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
@@ -136,7 +136,7 @@
     bluez
     macchanger
     comic-relief
-  ];
+  ] ++ environment.systemPackages;
 
 #  environment.systemPackages = [
 #    import /scripts/jetbrains.rider.nix
diff --git a/system/containerd.nix b/system/containerd.nix
index 387ff97..2bf2770 100644
--- a/system/containerd.nix
+++ b/system/containerd.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, environment, ... }: {
+{ config, pkgs, lib, ... }: rec {
   virtualisation.containerd.enable = true;
 
   virtualisation.containerd.settings = {