diff --git a/Makefile b/Makefile
index c1de29cc..3dbddfad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 NIXOS_VERSION := 19.09
 NIXOS_PREFIX  := $(PREFIX)/etc/nixos
-NIXOS_FLAGS   := -I my=$(PWD)
 
+FLAGS         := -I "my=$(PWD)" $(FLAGS)
+COMMAND       := test
 
-all: channels config secrets.nix test
+# The real Labowski
+all: channels config secrets.nix
+	@sudo nixos-rebuild $(FLAGS) $(COMMAND)
 
 install: result channels update config
 	@nixos-generate-config --root "$(PREFIX)"
@@ -12,10 +15,7 @@ install: result channels update config
 upgrade: update switch
 
 switch:
-	@sudo nixos-rebuild $(NIXOS_FLAGS) switch
-
-test:
-	@sudo nixos-rebuild $(NIXOS_FLAGS) test
+	@sudo nixos-rebuild $(FLAGS) switch
 
 clean:
 	@rm -f secrets.nix
@@ -28,15 +28,23 @@ update:
 config: $(NIXOS_PREFIX)/configuration.nix
 
 channels:
-	sudo nix-channel --add "https://nixos.org/channels/nixos-${NIXOS_VERSION}" nixos
-	sudo nix-channel --add "https://github.com/rycee/home-manager/archive/release-${NIXOS_VERSION}.tar.gz" home-manager
-	sudo nix-channel --add "https://nixos.org/channels/nixpkgs-unstable" nixpkgs-unstable
+	@sudo nix-channel --add "https://nixos.org/channels/nixos-${NIXOS_VERSION}" nixos
+	@sudo nix-channel --add "https://github.com/rycee/home-manager/archive/release-${NIXOS_VERSION}.tar.gz" home-manager
+	@sudo nix-channel --add "https://nixos.org/channels/nixpkgs-unstable" nixpkgs-unstable
 
 $(NIXOS_PREFIX)/configuration.nix:
 	@sudo mkdir -p "$(NIXOS_PREFIX)"
-	@echo "import ../dotfiles \"$$(hostname)\"" | sudo tee "$(NIXOS_PREFIX)/configuration.nix"
+	@echo "import $(PWD)/dotfiles \"$$(hostname)\"" | sudo tee "$(NIXOS_PREFIX)/configuration.nix"
 
 secrets.nix: secrets.nix.gpg
 	gpg -dq $< > $@
 
+
+# Convenience aliases
+i: install
+t: test
+s: switch
+up: upgrade
+
+
 .PHONY: update config channels test upgrade install