Change from tourist L to working Z visa

Hi, I'm currently in china on a holiday holding an L. I would like to start work so I will need to change to a Z. Can this be done in Hong Kong or will I have to return to my home country? I know the laws have been changed recently, does anyone know for sure the correct procedure. Thanks
Paul