diff --git a/src/ifs/wl_seat.rs b/src/ifs/wl_seat.rs
index 84f6017d..c89853d9 100644
--- a/src/ifs/wl_seat.rs
+++ b/src/ifs/wl_seat.rs
@@ -81,8 +81,8 @@ use {
         rect::Rect,
         state::{DeviceHandlerData, State},
         tree::{
-            ContainerNode, ContainerSplit, Direction, FoundNode, Node, NodeId, NodeLayer,
-            NodeLayerLink, NodeLocation, OutputNode, StackedNode, ToplevelNode, WorkspaceNode,
+            ContainerNode, ContainerSplit, Direction, FoundNode, Node, NodeLayer, NodeLayerLink,
+            NodeLocation, OutputNode, StackedNode, ToplevelNode, WorkspaceNode,
             generic_node_visitor, toplevel_create_split, toplevel_parent_container,
             toplevel_set_floating, toplevel_set_workspace,
         },
@@ -1753,7 +1753,7 @@ impl LedsListener for WlSeatGlobal {
 
 pub struct PositionHintRequest {
     seat: Rc<WlSeatGlobal>,
-    node: NodeId,
+    client_id: ClientId,
     old_pos: (Fixed, Fixed),
     new_pos: (Fixed, Fixed),
 }
@@ -1762,7 +1762,7 @@ pub async fn handle_position_hint_requests(state: Rc<State>) {
     loop {
         let req = state.position_hint_requests.pop().await;
         let (x, y) = (req.new_pos.0.round_down(), req.new_pos.1.round_down());
-        if state.node_at(x, y).node.node_id() != req.node {
+        if state.node_at(x, y).node.node_client_id() != Some(req.client_id) {
             continue;
         }
         let current_pos = req.seat.pointer_cursor.position();
diff --git a/src/ifs/wl_seat/wp_pointer_warp_v1.rs b/src/ifs/wl_seat/wp_pointer_warp_v1.rs
index 7626f127..33158ea2 100644
--- a/src/ifs/wl_seat/wp_pointer_warp_v1.rs
+++ b/src/ifs/wl_seat/wp_pointer_warp_v1.rs
@@ -95,7 +95,7 @@ impl WpPointerWarpV1RequestHandler for WpPointerWarpV1 {
             .position_hint_requests
             .push(PositionHintRequest {
                 seat: seat.clone(),
-                node: surface.node_id.into(),
+                client_id: surface.client.id,
                 old_pos: seat.pointer_cursor.position(),
                 new_pos: (x.apply_fract(x_int), y.apply_fract(y_int)),
             });
diff --git a/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs b/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
index aebb5cd0..540764af 100644
--- a/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
+++ b/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
@@ -94,7 +94,7 @@ impl SeatConstraint {
             .position_hint_requests
             .push(PositionHintRequest {
                 seat: self.seat.clone(),
-                node: self.surface.node_id.into(),
+                client_id: self.surface.client.id,
                 old_pos: self.seat.pointer_cursor.position(),
                 new_pos: (x.apply_fract(x_int), y.apply_fract(y_int)),
             });