diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el
index dcb1736..39ee5eb 100644
--- a/oni-org/oni-org.el
+++ b/oni-org/oni-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2022.0620.091626
+;; Version: 2022.0621.091652
 ;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-contrib org-bullets org-edna diminish all-the-icons olivetti)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -586,7 +586,7 @@ also move point to the start of the heading."
 (setq org-agenda-window-setup 'only-window)
 
 (setq org-agenda-custom-commands
-      `(("t" "Todo at this computer" tags-todo ,(format "TODO=\"TODO\"+%s" (system-name))
+      `(("t" "Todo at this computer" tags-todo ,(format "@%s|@computer|@emacs/TODO" (system-name))
          ((org-overriding-columns-format "%TODO %46ITEM %1BLOCKED %Effort")))
         ("r" "Reading list" tags-todo "TODO=\"READ\"+SCHEDULED=\"\"-Effort=\"\""
          ((org-overriding-columns-format "%8CATEGORY %ITEM %3EFFORT")