diff --git a/zion/object/channel.h b/zion/object/channel.h
index 404b773..b9fc105 100644
--- a/zion/object/channel.h
+++ b/zion/object/channel.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <glacier/container/intrusive_list.h>
 #include <glacier/memory/ref_ptr.h>
 
 #include "capability/capability.h"
 #include "include/ztypes.h"
-#include "lib/linked_list.h"
 #include "lib/message_queue.h"
 #include "lib/mutex.h"
 #include "lib/pair.h"
@@ -38,7 +38,7 @@ class Channel : public KernelObject {
   Mutex mutex_{"channel"};
   UnboundedMessageQueue message_queue_;
 
-  LinkedList<glcr::RefPtr<Thread>> blocked_threads_;
+  glcr::IntrusiveList<Thread> blocked_threads_;
 
   friend class glcr::MakeRefCountedFriend<Channel>;
   Channel() {}
diff --git a/zion/object/port.h b/zion/object/port.h
index 39d8b16..8c303f1 100644
--- a/zion/object/port.h
+++ b/zion/object/port.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include <glacier/container/intrusive_list.h>
 #include <glacier/memory/ref_ptr.h>
 
 #include "capability/capability.h"
-#include "lib/linked_list.h"
 #include "lib/message_queue.h"
 #include "lib/mutex.h"
 #include "object/kernel_object.h"
@@ -34,7 +34,7 @@ class Port : public KernelObject {
 
  private:
   UnboundedMessageQueue message_queue_;
-  LinkedList<glcr::RefPtr<Thread>> blocked_threads_;
+  glcr::IntrusiveList<Thread> blocked_threads_;
 
   Mutex mutex_{"Port"};
 };