Nucleus

diff --git a/include/nucleus/task.h b/include/nucleus/task.h
index 1e91a33..80a2a71 100644
--- a/include/nucleus/task.h
+++ b/include/nucleus/task.h
@@ -6,11 +6,9 @@
 #include <nucleus/cpu.h>
 #include <nucleus/object.h>
 #include <nucleus/memory.h>
+#include <nucleus/types.h>
 #include <nucleus/vfs.h>
 
-typedef struct Task Task;
-typedef struct Signals Signals;
-
 /* Task priorities */
 enum Priority {
 	NONE,
@@ -57,12 +55,11 @@ struct Task {
 	Signals *signals;
 };
 
+#define current cpu->task
+
 extern ObjectType taskType;
 extern ObjectType signalsType;
 
-extern Task *currentTask[];
-#define current currentTask[CPUID]
-
 /* Check if super-user */
 static inline int
 super_user(void)