Mohamad Riyadi, Indonesia