Move oncollision from Shape to Obstacle