diff --git a/view.c b/view.c
index 80cb8d3..0454943 100644
--- a/view.c
+++ b/view.c
@@ -300,5 +300,5 @@ view_from_wlr_surface(struct cg_server *server, struct wlr_surface *surface)
 struct wlr_surface *
 view_wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y)
 {
-	return view->impl->wlr_surface_at(view, sx, sy, sub_x, sub_y);
+	return wlr_scene_node_surface_at(&view->scene_surface->node, sx, sy, sub_x, sub_y);
 }
diff --git a/view.h b/view.h
index 3d45a2c..c18ddf1 100644
--- a/view.h
+++ b/view.h
@@ -45,7 +45,6 @@ struct cg_view_impl {
 	void (*activate)(struct cg_view *view, bool activate);
 	void (*maximize)(struct cg_view *view, int output_width, int output_height);
 	void (*destroy)(struct cg_view *view);
-	struct wlr_surface *(*wlr_surface_at)(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y);
 };
 
 struct cg_view_child {
diff --git a/xdg_shell.c b/xdg_shell.c
index fc1245e..1930723 100644
--- a/xdg_shell.c
+++ b/xdg_shell.c
@@ -226,13 +226,6 @@ destroy(struct cg_view *view)
 	free(xdg_shell_view);
 }
 
-static struct wlr_surface *
-wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y)
-{
-	struct cg_xdg_shell_view *xdg_shell_view = xdg_shell_view_from_view(view);
-	return wlr_xdg_surface_surface_at(xdg_shell_view->xdg_surface, sx, sy, sub_x, sub_y);
-}
-
 static void
 handle_xdg_shell_surface_request_fullscreen(struct wl_listener *listener, void *data)
 {
@@ -300,7 +293,6 @@ static const struct cg_view_impl xdg_shell_view_impl = {
 	.activate = activate,
 	.maximize = maximize,
 	.destroy = destroy,
-	.wlr_surface_at = wlr_surface_at,
 };
 
 void
diff --git a/xwayland.c b/xwayland.c
index 80482b8..6862271 100644
--- a/xwayland.c
+++ b/xwayland.c
@@ -96,12 +96,6 @@ destroy(struct cg_view *view)
 	free(xwayland_view);
 }
 
-static struct wlr_surface *
-wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y)
-{
-	return wlr_surface_surface_at(view->wlr_surface, sx, sy, sub_x, sub_y);
-}
-
 static void
 handle_xwayland_surface_request_fullscreen(struct wl_listener *listener, void *data)
 {
@@ -173,7 +167,6 @@ static const struct cg_view_impl xwayland_view_impl = {
 	.activate = activate,
 	.maximize = maximize,
 	.destroy = destroy,
-	.wlr_surface_at = wlr_surface_at,
 };
 
 void