use id instead of x-id, #53