Upgrade to Boot 1.0.0.RELEASE and clean up usage of id()